add git fix alias to resolve conficts

2026-03-03 06:27:21 +01:00 · 2016-07-25 22:39:15 +02:00
parent 787a7960b1
commit 9cf97c6354
1 changed files with 1 additions and 0 deletions
--- a/1
+++ b/1
@@ -19,6 +19,7 @@
    changes = diff --name-status -r
    diffstat = diff --stat -r
    lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
+    fix = "!f() { ${EDITOR} $(git diff --name-only | uniq ); }; f"
 [merge]
    tool = bc3
 [mergetool]