437 Commits

Author	SHA1	Message	Date
David Chen	529ba45cc7	fixed keybinding display in merge_panel.go	2020-01-07 09:50:25 -08:00
David Chen	66c7672a0c	updated keybinding config docs	2020-01-07 08:38:07 +08:00
David Chen	fd72a09d1e	if statements to map	2020-01-06 23:37:33 +08:00
David Chen	0ddf7c05c8	PickBothHunks -> pickBothHunks	2020-01-06 23:37:21 +08:00
David Chen	86b101c410	Merge branch 'master' into custom-keybindings	2020-01-04 08:12:36 +00:00
matejcik	0a31edecb6	make Ctrl+P visible	2020-01-03 15:09:59 +01:00
David Chen	029de4ac86	re-position key names so that the menu will show 'enter' instead of 'ctrl-m', or 'esc' instead of 'ctrl-['	2019-12-08 14:57:29 -08:00
David Chen	5f21f190b9	Merge branch 'master' into custom-keybindings	2019-12-08 14:40:11 -08:00
Jesse Duffield	dab78c8a63	stop the files panel from stealing focus whenever files are refreshed	2019-12-08 21:27:28 +11:00
David Chen	0d1230a959	added keybinding for fetchRemote	2019-12-07 09:26:17 -08:00
David Chen	c507e5f562	Merge branch 'master' into custom-keybindings	2019-12-07 09:19:43 -08:00
David Chen	7194dfa43c	better error messages	2019-12-06 22:39:41 -08:00
David Chen	e425f1df87	suggested keybinding improvements	2019-12-06 22:36:52 -08:00
Jesse Duffield	3f4613feb0	allow fetching remotes with 'f'	2019-12-07 16:23:04 +11:00
Jesse Duffield	033c21754b	fix commit message char count	2019-12-07 16:21:26 +11:00
David Chen	c89c35c6b3	bug fix: ctrl+combinations was not showing up in help menu	2019-12-06 10:26:39 -08:00
David Chen	1dbfea54bc	better error handling	2019-12-04 19:16:47 -08:00
David Chen	0a26050b47	fix	2019-12-04 18:33:00 -08:00
David Chen	fa6893fda9	feature: custom keybindings	2019-12-04 18:01:06 -08:00
Dawid Dziurla	1c38db1fc7	keybindings: alias V -> v	2019-11-27 20:37:07 +01:00
Jesse Duffield	bad06bb634	fix typo	2019-11-21 22:09:02 +11:00
Jesse Duffield	f905b27b00	couple of things to clean up after rebasing onto master	2019-11-21 22:07:14 +11:00
Jesse Duffield	3c13229145	add tags panel	2019-11-21 22:07:14 +11:00
Jesse Duffield	cea24c2cf9	allow editing remotes	2019-11-21 22:07:14 +11:00
Jesse Duffield	64017cf874	require double clicking menu items so you know what you're clicking	2019-11-21 22:07:14 +11:00
Jesse Duffield	b3bce8a1ba	refactor confirmation prompt code	2019-11-21 22:07:14 +11:00
Jesse Duffield	3b0cef2ec8	better handling of click events in list views	2019-11-21 22:07:14 +11:00
Jesse Duffield	07cbae4019	support setting upstream	2019-11-21 22:07:14 +11:00
Jesse Duffield	b42202ea1c	better fast forward	2019-11-21 22:07:14 +11:00
Jesse Duffield	8347dcd671	make upstream branch display more lenient on git errors	2019-11-21 22:07:14 +11:00
Jesse Duffield	dcb5285797	support rebasing onto remote branch	2019-11-21 22:07:14 +11:00
Jesse Duffield	a9cd647075	support deleting remote branches	2019-11-21 22:07:14 +11:00
Jesse Duffield	f0cd730fbb	ensure we switch tabs when switching context	2019-11-21 22:07:14 +11:00
Jesse Duffield	2afbd7ba7f	support merging remote branches into checked out branch	2019-11-21 22:07:14 +11:00
Jesse Duffield	55ff0c0dee	support detached heads when showing the selected branch	2019-11-21 22:07:14 +11:00
Jesse Duffield	6b7aaeca45	support adding/removing remotes	2019-11-21 22:07:14 +11:00
Jesse Duffield	1f3e1720a3	split RemoteBranch out from Branch	2019-11-21 22:07:14 +11:00
Jesse Duffield	6bd0979b4a	only refresh branches panel on focus lost when in the local-branches context	2019-11-21 22:07:14 +11:00
Jesse Duffield	986abc1e45	support viewing a remote branch	2019-11-21 22:07:14 +11:00
Jesse Duffield	61dac10bb9	support navigating remotes view	2019-11-21 22:07:14 +11:00
Jesse Duffield	92e43d9e77	allow changing tabs with [ and ]	2019-11-21 22:07:14 +11:00
Jesse Duffield	8aa1062e06	extract out some logic for list views	2019-11-21 22:07:14 +11:00
Jesse Duffield	7e0a8f235e	add contexts to views	2019-11-21 22:07:14 +11:00
Jesse Duffield	e6be849eb2	add remotes context to branches view	2019-11-21 22:07:14 +11:00
Jesse Duffield	f15e47bb67	add file watching for modified files ... log createErrorPanel error swallow error when adding file to watcher	2019-11-14 22:22:47 +11:00
Jesse Duffield	7995d56a85	allow editing or opening a file while resolving merge conflicts	2019-11-14 22:22:47 +11:00
Jesse Duffield	3b1d705473	show upstream branch for branch	2019-11-13 22:25:42 +11:00
Jesse Duffield	f43ba728e3	prompt to set upstream when pulling on untracked branch ... prompt to set upstream when pulling on untracked branch	2019-11-13 21:36:16 +11:00
Jesse Duffield	12b84307ac	specify upstream when pushing a branch for the first time	2019-11-11 23:30:30 +11:00
Jesse Duffield	cbc82cd3c1	allow for changing the current directory on exit ... For this to work you'll need to put this in your ~/.zshrc (or equivalent rc file): lg() { export LAZYGIT_NEW_DIR_FILE=/Users/jesseduffieldduffield/Library/Application\ Support/jesseduffield/lazygit/.lastd lazygit "$@" if [ -f $LAZYGIT_NEW_DIR_FILE ]; then cd "$(cat $LAZYGIT_NEW_DIR_FILE)" rm -f $LAZYGIT_NEW_DIR_FILE > /dev/null fi }	2019-11-11 21:45:31 +11:00