From 9cf97c635442778b78db9dae84e1ae63f56234b7 Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Mon, 25 Jul 2016 22:39:15 +0200
Subject: [PATCH] add git fix alias to resolve conficts

---
 gitconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gitconfig b/gitconfig
index 94de6d1..888a985 100644
--- a/gitconfig
+++ b/gitconfig
@@ -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]