From: Oleg Broytman <phd@phdru.name>
Date: Mon, 18 Jul 2016 06:11:38 +0000 (+0300)
Subject: .gitconfig: prefer $VISUAL over $EDITOR; use vi as the last resort
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=797be72a0ded67620315027183f38c5ffb6604f8;p=dotfiles.git

.gitconfig: prefer $VISUAL over $EDITOR; use vi as the last resort
---

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