X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=.gitconfig;h=e99fce73d4e95ba8a0504032752f60fac353935b;hb=797be72a0ded67620315027183f38c5ffb6604f8;hp=4ecffc961f05df80455355b514ce00f71b1e9c42;hpb=54bbf45016b36c34c560a2158ae51329d74805ea;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 4ecffc9..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
@@ -131,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