git diffmerge tool 配置

 

原文 http://twobitlabs.com/2011/08/install-diffmerge-git-mac-os-x/

摘录保存

最好安装 diffmerge installer, 如果安装了 dmg 文件， diffmerge 官方解决方法：

http://www.sourcegear.com/diffmerge/webhelp/sec__inst__mac.html

To install these extras:

sudo cp Extras/diffmerge.sh /usr/bin/diffmerge 
sudo chmod 755 /usr/bin/diffmerge 
sudo cp Extras/diffmerge.1 /usr/share/man/man1/diffmerge.1 
sudo chmod 644 /usr/share/man/man1/diffmerge.1

 设置git 的diffmerge tool

git config --global diff.tool diffmerge
git config --global difftool.diffmerge.cmd 'diffmerge "$LOCAL" "$REMOTE"'
git config --global merge.tool diffmerge
git config --global mergetool.diffmerge.cmd 'diffmerge --merge --result="$MERGED" "$LOCAL" "$(if test -f "$BASE"; then echo "$BASE"; else echo "$LOCAL"; fi)" "$REMOTE"'
git config --global mergetool.diffmerge.trustExitCode true

 

 

Now, whenever you want it to launch diffs just use difftool where you’d normally use diff:

# diff the local file.m against the checked-in version
git difftool file.m

# diff the local file.m against the version in some-feature-branch
git difftool some-feature-branch file.m

# diff the file.m from the Build-54 tag to the Build-55 tag
git difftool Build-54..Build-55 file.m

To resolve merge conflicts, just run git mergetool:

git mergetool