Git: conflicts alias.

2013-02-12 10:03:39 +04:00 · 2013-02-12 10:03:39 +04:00 · d43df3b1b4
commit d43df3b1b4
parent bb1d21345c
1 changed files with 1 additions and 0 deletions
--- a/tilde/gitconfig
+++ b/tilde/gitconfig
@ -27,6 +27,7 @@
 	s = status -sb
 	l = log --graph --pretty=format:'%C(magenta)%h%C(blue)%d%Creset %s %C(blue bold)- %an, %ar%Creset'
 	ll = log --stat --abbrev-commit
+	conflicts = diff --name-only --diff-filter=U
 [push]
 	default = current