601 Commits

Author	SHA1	Message	Date
Jesse Duffield	fb395bca6e	support reverting merge commits	2021-06-05 22:15:51 +10:00
Jesse Duffield	d502c43ae8	fix tests	2021-06-05 10:58:36 +10:00
caojoshua	e7c657fba0	Docs for EditCommand.	2021-06-05 10:58:09 +10:00
caojoshua	60468d2e17	Edit command as user OS config option	2021-06-05 10:58:09 +10:00
Robert Verst	cb78cf7de4	Simplify sorting of git tags by using git's functions	2021-06-05 10:56:46 +10:00
Robert Verst	94b52af661	Remove config, make default sort order descending	2021-06-05 10:56:46 +10:00
Robert Verst	472288c81b	Add user config to change the sort order of tags	2021-06-05 10:56:46 +10:00
Jesse Duffield	98375dc902	refactor merge panel	2021-04-18 18:58:09 +10:00
Jesse Duffield	e73de332a1	refactor line by line panel	2021-04-18 16:55:09 +10:00
Jesse Duffield	069c7c9d35	fix test	2021-04-11 17:07:49 +10:00
Jesse Duffield	8969464b00	log TODO content when interactive rebasing	2021-04-11 17:07:49 +10:00
Jesse Duffield	6137d66914	no need to log this	2021-04-11 17:07:49 +10:00
Jesse Duffield	6fbe660f96	full coverage for logging commands	2021-04-11 17:07:49 +10:00
Jesse Duffield	74320f0075	more logging of commands	2021-04-11 17:07:49 +10:00
Jesse Duffield	bfad972f0c	fix bug where mixed reset is actually a soft reset	2021-04-11 17:07:49 +10:00
Jesse Duffield	bb918b579a	start adding support for logging of commands	2021-04-11 17:07:49 +10:00
Jesse Duffield	e145090046	add cmdLog panel	2021-04-11 17:07:49 +10:00
Jesse Duffield	9f4433d8b5	allow opening merge tool	2021-04-11 10:21:53 +10:00
Jesse Duffield	e42e7e5cbd	fix commit amend	2021-04-10 11:54:38 +10:00
Jesse Duffield	963fcc1444	don't kill the index.lock file until I decide whether it's actually a good idea	2021-04-06 19:34:32 +10:00
Jesse Duffield	20bdba15f6	amend reword test	2021-04-06 19:34:32 +10:00
Jesse Duffield	e636857057	prevent adding staged files when renaming top commit	2021-04-06 19:34:32 +10:00
Jesse Duffield	e04e2ebab5	try better logging for CI	2021-04-06 19:34:32 +10:00
Jesse Duffield	5ce9e0193a	add retry logic for running git commands to avoid index.lock problems	2021-04-06 19:34:32 +10:00
Jesse Duffield	c33f8d2790	prevent git from prompting user if program is run directly	2021-04-06 19:34:32 +10:00
Jesse Duffield	8901d11674	fix merge conflict cat issue on windows	2021-04-02 13:15:07 +11:00
Jesse Duffield	7d62f103e4	big refactor to give our enums actual types	2021-04-02 11:00:15 +11:00
Jesse Duffield	9e85d37fb9	refactor to no longer call these things file changes	2021-04-02 11:00:15 +11:00
Jesse Duffield	50c169e0a3	better colouring for directories for when adding a patch	2021-04-02 11:00:15 +11:00
Jesse Duffield	7364525bf5	do not show commit files of another parent as added to the patch	2021-04-02 11:00:15 +11:00
Jesse Duffield	54910fdb76	refactor	2021-04-02 11:00:15 +11:00
Jesse Duffield	332a3c4cbf	file tree for commit files	2021-04-02 11:00:15 +11:00
Jesse Duffield	eb54189683	support GIT_EDITOR	2021-04-01 20:40:02 +11:00
Jesse Duffield	e8e59306fc	shell out custom commands	2021-04-01 20:25:30 +11:00
Jesse Duffield	8af3fe3b4a	faster startup	2021-04-01 09:13:29 +11:00
Jesse Duffield	d5639e6e95	refactor	2021-03-30 21:57:00 +11:00
Jesse Duffield	9e67f74ca3	prevent staging directory containing files with inline merge conflicts	2021-03-30 21:57:00 +11:00
Jesse Duffield	d2e1b35eee	small fixes	2021-03-30 21:57:00 +11:00
Jesse Duffield	ef204b0adf	remove collapsed field	2021-03-30 21:57:00 +11:00
Jesse Duffield	89c2f4f2ff	fix spec	2021-03-30 21:57:00 +11:00
Jesse Duffield	5e05e8b62b	fix comment	2021-03-30 21:57:00 +11:00
Jesse Duffield	1f7273af23	better way to check if a node is a leaf	2021-03-30 21:57:00 +11:00
Jesse Duffield	2b8302bced	refactor	2021-03-30 21:57:00 +11:00
Jesse Duffield	1b94462410	rename some things	2021-03-30 21:57:00 +11:00
Jesse Duffield	46b79c7c61	drop Name field from status line node	2021-03-30 21:57:00 +11:00
Jesse Duffield	fe4e305410	safer code	2021-03-30 21:57:00 +11:00
Jesse Duffield	1183f68e19	better handling of refreshed files	2021-03-30 21:57:00 +11:00
Jesse Duffield	da6fe01eca	allow toggling on/off file tree mode	2021-03-30 21:57:00 +11:00
Jesse Duffield	c27cea6f30	more file tree improvements	2021-03-30 21:57:00 +11:00
Jesse Duffield	cd0532b4d6	allow ignoring directories	2021-03-30 21:57:00 +11:00