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

Git: DiffMerge.

Browse Source
This commit is contained in:
Artem Sapegin 2013-02-24 23:24:42 +04:00
parent d4e7928be9
commit 880127549c
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tilde/gitconfig
View File

@ -44,6 +44,17 @@
[url "git://gist.github.com/"] [url "git://gist.github.com/"]
insteadOf = "gist:" insteadOf = "gist:"
# DiffMerge
[merge]
tool = diffmerge
[mergetool "diffmerge"]
cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
trustExitCode = true
[diff]
tool = diffmerge
[difftool "diffmerge"]
cmd = diffmerge $LOCAL $REMOTE
# Include local settings # Include local settings
# Requires Git 1.7.10 # Requires Git 1.7.10
# git config -f ~/.gitlocal user.email "artem@sapegin.ru" # git config -f ~/.gitlocal user.email "artem@sapegin.ru"