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 beyond compare as mergetool

Browse Source
This commit is contained in:
Thomas Ruoff
2012-10-09 11:56:58 +02:00
parent 8ceaf9478a
commit cdb7778375
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gitconfig
View File

@@ -17,3 +17,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
[merge]
tool = bc3
[mergetool]
cmd = /usr/bin/bcompare $LOCAL $REMOTE $BASE $MERGED