Merge branch 'master' into jenipapo

This commit is contained in:
Thomas Ruoff
2016-07-25 22:41:56 +02:00
6 changed files with 23 additions and 5 deletions

View File

@@ -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]