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

remove bc3 as git's mergetool

Browse Source
This commit is contained in:
Thomas Ruoff
2014-07-16 11:51:18 +02:00
parent 529d9878f8
commit 3df8bfe427
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gitconfig
View File

@@ -17,10 +17,6 @@
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
[push] [push]
default = current default = current
[giggle] [giggle]