jjkiers/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Git: conflicts alias.

Browse Source
This commit is contained in:
Artem Sapegin 2013-02-12 10:03:39 +04:00
parent bb1d21345c
commit d43df3b1b4
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tilde/gitconfig
View File

@ -27,6 +27,7 @@
s = status -sb s = status -sb
l = log --graph --pretty=format:'%C(magenta)%h%C(blue)%d%Creset %s %C(blue bold)- %an, %ar%Creset' l = log --graph --pretty=format:'%C(magenta)%h%C(blue)%d%Creset %s %C(blue bold)- %an, %ar%Creset'
ll = log --stat --abbrev-commit ll = log --stat --abbrev-commit
conflicts = diff --name-only --diff-filter=U
[push] [push]
default = current default = current