tomru/DotfilesOld
1
0
Fork 0
mirror of https://github.com/tomru/DotfilesOld.git synced 2026-03-04 15:07:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

add git fix alias to resolve conficts

Browse Source
This commit is contained in:
Thomas Ruoff
2016-07-25 22:39:15 +02:00
parent 787a7960b1
commit 9cf97c6354
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gitconfig
View File

@@ -19,6 +19,7 @@
changes = diff --name-status -r changes = diff --name-status -r
diffstat = diff --stat -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 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] [merge]
tool = bc3 tool = bc3
[mergetool] [mergetool]