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

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index e8f7f7741bf2284e7d62d99555be17b20de935fb..e99fce73d4e95ba8a0504032752f60fac353935b 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -35,8 +35,6 @@
 
   ### commit ###
 
-  ci = commit --interactive
-
   cm = commit --message
 
   ### checkout ###
@@ -106,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
@@ -118,6 +116,7 @@
        cav = commit --all --verbose
        cane = commit --amend --no-edit
        checkin = commit
+       ci = commit
        cat = cat-file -p
        dump = cat-file -p
        file = cat-file -t
@@ -132,7 +131,7 @@
        lr1 = log --decorate --reverse --oneline
        lr5 = log --decorate --reverse -5
        null-merge = merge --strategy=ours
-       rbi123 = "!f() { git rebase --interactive $1 $2 ${3:-\"@{upstream\\}\"}; }; f"
+       rbi123 = "!f() { exec git rebase --interactive $1 $2 ${3:-\"@{upstream\\}\"}; }; f"
        rbi = !git rbi123 '' ''
        rbia = !git rbi123 --autosquash ''
        rbiap = !git rbi123 --autosquash --preserve-merges