1312 Commits

Author	SHA1	Message	Date
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
Jakob Kogler	ee7a6391a8	remove redundant commit	2022-01-07 11:01:42 +11:00
Jakob Kogler	68fc6059d3	rename variable to failedCommitMessage	2022-01-07 11:01:42 +11:00
Jakob Kogler	f981255a5b	don't ignore error when commit with subprocess fails ... If signing by GPG is enabled, the git commit command will be executed in a subprocess, differently from when it is executed without GPG signing. In case of an error, e.g. a failing pre-commit hook, the error needs to be passed along, and not just ignored.	2022-01-07 11:01:42 +11:00
Jakob Kogler	beedc2553d	remember the message if commit fails ... In case a commit fails, e.g. because a pre-commit hook returns an error, lazygit will now remember the commit message and will suggest it during the next commit (e.g. after fixing the error of the pre-commit hook).	2022-01-07 11:01:42 +11:00
Jesse Duffield	0d3e5e6a1d	simplify fetch	2022-01-07 10:52:51 +11:00
Jesse Duffield	93729ba61b	fix some things	2022-01-07 10:52:51 +11:00
Jesse Duffield	91fe68576c	refactor	2022-01-07 10:52:51 +11:00
Jesse Duffield	05fa483f48	simplify how we log commands	2022-01-07 10:52:51 +11:00