244 Commits

Author	SHA1	Message	Date
Jesse Duffield Duffield	f4938deaae	change type of cherryPickedCommits from []string to []*Commit	2019-02-24 17:34:19 +11:00
Jesse Duffield Duffield	a8858cbd12	support cherry picking commits	2019-02-24 13:51:52 +11:00
Jesse Duffield Duffield	1a19b1412d	remove old rebase code now that we're only ever interactively rebasing	2019-02-24 11:03:14 +11:00
Jesse Duffield Duffield	95d451e59a	Make it easier to run sync/async commands, switch to interactive rebase when rebasing on branches	2019-02-24 10:58:15 +11:00
Jesse Duffield	f6b3a9b184	rearranging todo items while interactively rebasing	2019-02-24 09:42:34 +11:00
Jesse Duffield	cdc50e8557	more support for files with spaces	2019-02-24 09:42:34 +11:00
Jesse Duffield	0173fdb9df	support file renames	2019-02-24 09:42:32 +11:00
Jesse Duffield	0228e25084	work towards more interactive rebase options	2019-02-19 23:36:36 +11:00
Jesse Duffield	935f774834	don't autostash when editing	2019-02-19 09:34:24 +11:00
Jesse Duffield	dcc7855fd0	pull commit list builder functions into their own builder struct	2019-02-19 09:18:30 +11:00
Jesse Duffield	a8e22ed82f	show interactive rebase commits that are yet to go	2019-02-19 09:03:29 +11:00
Jesse Duffield	d44638130c	add various interactive rebase commands	2019-02-18 23:27:54 +11:00
Jesse Duffield	76a27f417f	rename any commit	2019-02-18 21:29:43 +11:00
Jesse Duffield	e011e9bc42	more work on rebasing feature	2019-02-16 21:01:17 +11:00
Jesse Duffield	ad93b4c863	consider whether the view has focus when rendering the contents of a view	2019-02-16 15:17:44 +11:00
Jesse Duffield	d967f65329	fix git tests	2019-02-16 11:24:47 +11:00
Jesse Duffield	6430ab6ac9	Merge branch 'master' into feature/rebasing	2019-02-11 22:46:27 +11:00
Jesse Duffield	cfe3605e6b	use go-errors package to display stacktrace of errors that cause panics	2019-02-11 22:39:17 +11:00
Jesse Duffield	3d343e9b57	Merge branch 'master' into feature/rebasing	2019-02-11 21:02:53 +11:00
KimMachineGune	3e24069722	pkg: Fix typo	2019-01-16 18:06:11 +11:00
Jesse Duffield	0afffd03ca	remove comment	2018-12-19 21:46:48 +11:00
mjarkk	800b40ecc4	Translated credentials error with git push/pull/fetch	2018-12-19 10:06:58 +01:00
Jesse Duffield	7835fce708	fix tests	2018-12-18 22:40:36 +11:00
Jesse Duffield	20a94447d7	explicitly return newlines to our live command stdin	2018-12-18 22:23:17 +11:00
Jesse Duffield	c35255b7a9	set stderr ourselves so that we only read the error output if there is any	2018-12-18 21:25:49 +11:00
mjarkk	f5f726e9c4	A try to hide the password from the error output	2018-12-17 08:58:09 +01:00
Jesse Duffield	4886b8350e	always hide rather than delete the credentials view, and don't log on error in case there is a user password in the error	2018-12-16 17:28:04 +11:00
mjarkk	af26b5f3e0	Tried to fix circleci	2018-12-14 13:45:43 +01:00
mjarkk	70cd6700e7	Tried to fix circleci	2018-12-14 13:43:13 +01:00
mjarkk	d11f8989d9	Merge branch 'https-ask-for-username-password' of https://github.com/mjarkk/lazygit into https-ask-for-username-password	2018-12-14 13:40:40 +01:00
mjarkk	0fca27d022	Tried to fix circleci	2018-12-14 13:40:29 +01:00
Mark Kopenga	255319e597	Merge branch 'master' into https-ask-for-username-password	2018-12-14 11:13:29 +01:00
mjarkk	5d038dfd33	Removed the wired error handling	2018-12-12 22:11:31 +01:00
mjarkk	0577d3b97f	Removed the username / password savety check ... This check is not realy needed because the change that it will show up a second time is so low that this is more work to check than the change it actualy might happen	2018-12-12 21:08:53 +01:00
Jesse Duffield	a26c15dafa	some fixes for issues around the credentials panel	2018-12-12 22:34:20 +11:00
Jesse Duffield	9489a94473	Make merge panel its own panel	2018-12-11 22:02:12 +11:00
Jesse Duffield	e0ff46fe53	more work on rebasing including visual indicators	2018-12-11 09:39:54 +11:00
Glenn Vriesman	7a7e885773	Added rebase support commands	2018-12-11 09:39:54 +11:00
Glenn Vriesman	670f0e37c7	Added rebase functions	2018-12-11 09:39:54 +11:00
Glenn Vriesman	822dc5dada	Moved push-pullables status to the end	2018-12-11 09:38:33 +11:00
mjarkk	f14effe5f5	Worked and fixed a view comments	2018-12-09 13:04:19 +01:00
Mark Kopenga	19a6a32625	Merge branch 'master' into https-ask-for-username-password	2018-12-08 16:41:39 +01:00
Jesse Duffield	ff856b7630	fetching branches without checking out	2018-12-08 11:51:47 +11:00
Jesse Duffield	99a8b1ae8b	making a start on unidirectional data binding to fix these UI bugs	2018-12-08 11:51:47 +11:00
Mark Kopenga	1b6d34e76a	Merge branch 'master' into https-ask-for-username-password	2018-12-06 08:31:12 +01:00
Jesse Duffield	3b51d7cd00	clean as well as reset (I'm hoping this is a good design decision)	2018-12-05 20:06:47 +11:00
Jesse Duffield	66512ca253	use porcelain git rather than go-git for reset --hard HEAD because go-git takes over 5 seconds	2018-12-05 19:49:07 +11:00
Jesse Duffield	c0f9795910	staging lines and hunks	2018-12-05 19:33:46 +11:00
Jesse Duffield	658e5a9faf	initial support for staging individual lines	2018-12-04 22:11:48 +11:00
mjarkk	2edd2b74ff	Removed a lot of useless code	2018-12-02 14:58:18 +01:00