1320 Commits

Author	SHA1	Message	Date
Matt Cles	4df7646654	Add configurable colors for branch prefixes ... Branches can now be colored based on their prefix, if it matches a user defined prefix in the config file. If no user defined prefix matches, then it will fallback to the defaults: green for 'feature', yellow for 'bugfix', and red for 'hotfix'. All remaining branches will be set to the default text color.	2022-02-01 18:55:45 +11:00
Jesse Duffield	1b09674ce8	simplify submodule remove	2022-01-29 00:17:32 +11:00
Jesse Duffield	d13a648132	ensure stash panel refreshes	2022-01-28 20:07:30 +11:00
Jesse Duffield	84a1992055	better locking of merge panel state	2022-01-27 21:25:04 +11:00
Jesse Duffield	fa2e7ae1e7	show only merge conflict files when there are merge conflicts	2022-01-26 20:28:32 +11:00
Jesse Duffield	5a3f81d1f7	select current bisect commit even if bisect was started on another branch	2022-01-26 19:29:17 +11:00
Jesse Duffield	ebbdf829e7	fix panic on rebase	2022-01-26 17:20:58 +11:00
Jesse Duffield	5e9cfab283	better rendering of bisect markets in commits panel	2022-01-26 16:52:20 +11:00
Jesse Duffield	ca7cfc3232	only show commits from start ref if bad commit is reachable from there	2022-01-26 16:52:20 +11:00
Jesse Duffield	c8cc18920f	improve merge conflict flow	2022-01-26 14:50:47 +11:00
glendsoza	eb57e3ead0	Fixed the issue with linting	2022-01-26 09:04:12 +11:00
glendsoza	0caa391c4d	Changes as per review	2022-01-26 09:04:12 +11:00
glendsoza	0c6bdac2f7	Changes as per review	2022-01-26 09:04:12 +11:00
glendsoza	257e222f8d	ISSUE 1706: Ask confirmation before reverting a commit	2022-01-26 09:04:12 +11:00
Jesse Duffield	58bdcbf1dd	always refresh after stash action	2022-01-24 19:18:09 +11:00
Jesse Duffield	61ccc1efd2	exclude interactive rebase TODO commits from commit graph	2022-01-22 15:12:24 +11:00
Jesse Duffield	5b7dd9e43c	properly resolve cyclic dependency	2022-01-22 10:48:51 +11:00
Jesse Duffield	4ab5e54139	add support for git bisect	2022-01-22 10:48:51 +11:00
Birger Skogeng Pedersen	ab84410b41	check returned error (if any) from UpdateWindowTitle	2022-01-21 23:13:39 +11:00
Birger Skogeng Pedersen	62a7d9bbcc	invoke title-setting shell command appropriately	2022-01-21 23:13:39 +11:00
Birger Skogeng Pedersen	555d8bbc96	set repo name as window title when loading repo, fix #1691	2022-01-21 23:13:39 +11:00
Jesse Duffield	b6fb7f1365	fix integration test	2022-01-18 21:25:52 +11:00
Jesse Duffield	d019626342	do not show branch graph when in filtering mode	2022-01-17 22:00:53 +11:00
Jesse Duffield	595aca2a4b	make integration test pass	2022-01-17 19:14:59 +11:00
Jesse Duffield	2691477aff	allow sandbox mode with integration tests	2022-01-17 19:14:59 +11:00
Jesse Duffield	99035959a1	fix merge scroll bug	2022-01-16 23:16:05 +11:00
Jesse Duffield	0092c9d08d	fix bug with subprocess	2022-01-16 03:32:09 +00:00
Jesse Duffield	befa35645e	fix bug which prevented quitting with confirm	2022-01-15 20:35:25 +11:00
Jesse Duffield	1c84f77319	always specify upstream when pushing/pulling	2022-01-15 15:34:01 +11:00
Jesse Duffield	8d8bdb948b	avoid deadlock in merge panel	2022-01-15 14:15:41 +11:00
Jesse Duffield	cdcfeb396f	stop refreshing the screen so much	2022-01-15 14:15:41 +11:00
Jesse Duffield	8263d15b03	fix issue where custom command would not open a menu	2022-01-15 10:14:19 +11:00
Jesse Duffield	2436ff197a	fewer panics	2022-01-09 14:14:47 +11:00
Jesse Duffield	e5096e71ab	add integration test for discarding old files	2022-01-09 14:14:47 +11:00
Jesse Duffield	ceb927fec0	fix formatting	2022-01-09 14:14:47 +11:00
Jesse Duffield	0dfd02c42d	allow rewording old commits	2022-01-09 14:14:47 +11:00
Jesse Duffield	ee15202207	add newline after message because it looks like the message doesn't appear otherwise for some reason	2022-01-09 14:09:53 +11:00
Jesse Duffield	18f48a43d5	add some more linters	2022-01-09 14:09:53 +11:00
Jesse Duffield	fdf79fdeee	fix bug that caused credentials popup to be raised unexpectedly	2022-01-09 14:09:53 +11:00
Jesse Duffield	0dd1c12e2f	fix format issue	2022-01-09 14:09:53 +11:00
Jesse Duffield	364c5db19c	shorten name	2022-01-09 14:09:53 +11:00
Jesse Duffield	c9a0cc6b30	refactor	2022-01-09 14:09:53 +11:00
Jesse Duffield	3621854dc7	fix tests	2022-01-09 14:09:53 +11:00
Jesse Duffield	ee8ff6512f	trim down gitcommand struct some more	2022-01-09 14:09:53 +11:00
Jesse Duffield	610e503296	refactor git flow	2022-01-09 14:09:53 +11:00
Jesse Duffield	e92076d2c2	start removing direct calls to cmd.New from gui	2022-01-09 14:09:53 +11:00
Jesse Duffield	3f44eac95b	remove repo field	2022-01-09 14:09:53 +11:00
Jesse Duffield	946a35b59d	remove OSCommand field	2022-01-09 14:09:53 +11:00
Jesse Duffield	f503ff1ecb	start breaking up git struct	2022-01-09 14:09:53 +11:00
Jesse Duffield	48a4565d1f	remove log of error now that we're returning it normally	2022-01-07 11:01:42 +11:00