Author: Kyle Fuller <kyle@fuller.li> 2026-06-09 20:50:04 +0100 +0100
Committer: Kyle Fuller <kyle@fuller.li> 2026-06-09 20:50:04 +0100 +0100
Commit: 756db52e53c6023f3d03520695acb008f515e1c3
Parent: 8ac647b27e7fd5b7ff53540dfbd3257175dd73dc
fix(git): respect $EDITOR in git conflict
diff --git a/.gitconfig b/.gitconfig
index 74c10ab7fbe2d2f109b1bbab52c6f36774730eae..253cbed048587e5ccb280a88942ee5f4be09eee2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -15,7 +15,7 @@ wip = commit -m 'wip'
rev = rev-parse HEAD
s = status -s
l = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
- conflict = "!f() { git status -s | grep ^UU | awk '{print $2}' ; }; vim `f`"
+ conflict = "!f() { git status -s | grep ^UU | awk '{print $2}' ; }; $EDITOR `f`"
fixup = "!git log --oneline -n 20 | fzf | cut -d ' ' -f 1 | xargs git commit --no-verify --fixup"
[pull]