97 Commits

Author	SHA1	Message	Date
skanehira	c350cdba43	add feature of display diff between specific commits #397	2019-04-06 13:02:20 +11:00
Jesse Duffield	acfc961909	move soft reset keybinding into reset options	2019-03-23 13:26:17 +11:00
Jesse Duffield	f502f75e1f	add more options for resetting files in the working tree	2019-03-23 13:26:17 +11:00
Jesse Duffield	ff97ef7b94	support discarding unstaged changes	2019-03-23 13:26:17 +11:00
skanehira	32ddf0c296	generate commit files keybind	2019-03-18 09:49:23 +11:00
Jesse Duffield	e583cc2519	allow autostashing changes when checking out a branch	2019-03-16 12:51:48 +11:00
Jesse Duffield	43e5c042a2	prompt user to git init when outside a repo	2019-03-16 11:38:16 +11:00
Jesse Duffield	3f567c952c	i18n for error message about a feature being disabled for GPG users	2019-03-16 10:20:27 +11:00
Jesse Duffield	4f7f6a073c	allow user to discard old file changes for a given commit	2019-03-16 10:20:27 +11:00
Jesse Duffield	0e008cc15f	allow user to checkout old files	2019-03-16 10:20:27 +11:00
Jesse Duffield	1ad9c6faac	minor cleanup	2019-03-16 10:20:27 +11:00
skanehira	06fe726ee7	Add feature of display committed file list #383	2019-03-16 10:20:27 +11:00
Jesse Duffield	43758cbb5f	i18n for rebase loading states	2019-03-03 16:11:20 +11:00
Jesse Duffield	0079015102	distinguish between inline and non-inline merge conflicts	2019-03-03 15:58:01 +11:00
Jesse Duffield	dbb01b028d	populate dutch and polish i18n files with new messages	2019-03-02 21:31:48 +11:00
Jesse Duffield	7a170bbccf	extend cheatsheet generator to contain context based keybindings	2019-03-02 19:05:21 +11:00
Jesse Duffield	e331dfcaf8	update i18n	2019-03-02 17:46:56 +11:00
Jesse Duffield Duffield	23c51ba708	cleanup	2019-02-24 18:34:18 +11:00
Jesse Duffield Duffield	a8858cbd12	support cherry picking commits	2019-02-24 13:51:52 +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	6c1d2d45ef	some i18n and restricting rewording during interactive rebase	2019-02-24 09:42:35 +11:00
Jesse Duffield	f6b3a9b184	rearranging todo items while interactively rebasing	2019-02-24 09:42:34 +11:00
Jesse Duffield	0228e25084	work towards more interactive rebase options	2019-02-19 23:36:36 +11:00
Jesse Duffield	d44638130c	add various interactive rebase commands	2019-02-18 23:27:54 +11:00
Jesse Duffield	adc2529019	dealing better with errors at the top level	2019-02-18 19:42:23 +11:00
Jesse Duffield	e011e9bc42	more work on rebasing feature	2019-02-16 21:01:17 +11:00
Jesse Duffield	198cbee498	introduce panel contexts and more work on rebasing	2019-02-16 12:07:27 +11:00
Jesse Duffield	3d343e9b57	Merge branch 'master' into feature/rebasing	2019-02-11 21:02:53 +11:00
Jesse Duffield	c71bcc64ed	move fetch keybinding to files view to make way for branch-specific fetched	2018-12-12 22:33:42 +11:00
Jesse Duffield	9489a94473	Make merge panel its own panel	2018-12-11 22:02:12 +11:00
Glenn Vriesman	7b850c56c4	Added some translations	2018-12-11 09:39:54 +11:00
mjarkk	8e3f5e19e0	Changed some other names	2018-12-10 08:04:22 +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
mjarkk	8f904ffd72	Working popup	2018-12-07 14:56:29 +01:00
mjarkk	6d0fa8bc29	Made some small inprovements	2018-12-06 09:05:51 +01:00
mjarkk	21a808a52b	Renamed branch to branches	2018-12-06 08:39:49 +01:00
mjarkk	89c272eed5	Removed the tabs for spaces	2018-12-06 08:33:04 +01:00
Mark Kopenga	1b6d34e76a	Merge branch 'master' into https-ask-for-username-password	2018-12-06 08:31:12 +01:00
mjarkk	f6e83cdbdf	Started working on the popup	2018-12-06 08:26:05 +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	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
mjarkk	9da1382e09	Added credentials popup	2018-11-25 13:15:36 +01:00
Mark Kopenga	45c249acca	Merge branch 'master' into https-ask-for-username-password	2018-10-27 15:06:51 +02:00
Mark Kopenga	1fedda6a75	Merge branch 'master' into https-ask-for-username-password	2018-10-23 13:52:50 +02:00
Jesse Duffield	467775fc1c	Merge branch 'master' into master	2018-10-23 09:43:25 +11:00
Naveen Vardhi	3a23cb87b7	Remove force delete keybinding ... And force delete messages gives feedback about merge status	2018-10-21 21:13:24 +05:30
mjarkk	727ba9f42e	test	2018-10-20 17:21:17 +02:00