Author: Kyle Fuller <kyle@mentallyfriendly.com> 2013-02-18 15:25:27 +0000 +0000
Committer: Kyle Fuller <kyle@mentallyfriendly.com> 2013-02-18 15:25:27 +0000 +0000
Commit: 8ac49b2f08334e25189cfa912db8aee8e04fdc51
Parent: 5fe370f2b6ea3b6049c8ba944bdbafd57793119c
$ git conflict - Open all conflicted merge files with Git
https://coderwall.com/p/j7kxsa
diff --git a/.gitconfig b/.gitconfig
index 3be7314cdba0cfa6df35645dbef5fc2b568799b0..ba49c9fcc76a6271551a8eae45bc6a6afb3e8221 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -15,6 +15,7 @@ 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
standup = !clear && git log --since '1 day ago' --no-merges --pretty=format':%C(yellow)%h %aN%n %B%n' --author 'Kyle Fuller'
+ conflict = "!f() { git status -s | grep ^UU | awk '{print $2}' ; }; vim `f`"
[push]
default = matching