From 797be72a0ded67620315027183f38c5ffb6604f8 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Mon, 18 Jul 2016 09:11:38 +0300 Subject: [PATCH] .gitconfig: prefer $VISUAL over $EDITOR; use vi as the last resort --- .gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitconfig b/.gitconfig index a2a361d..e99fce7 100644 --- a/.gitconfig +++ b/.gitconfig @@ -104,7 +104,7 @@ # Editing and adding conflicted files: when we get many merge conflicts # and want to quickly solve them using an editor, then add the files. - edit-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; $EDITOR `f`" + edit-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; "${VISUAL:-${EDITOR:-vi}}" `f`" add-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`" # Get the current branch name -- 2.39.2