首先,在官网下载http://www.sourcegear.com/diffmerge/downloaded.php
然后,对应文件夹下执行命令:sudo dpkg -i diffmerge_4.2.0.*.deb 进行安装
卸载命令如下:sudo dpkg -r diffmerge
目的:现在为了实现一个功能,
git difftool 在git下依次打开比较修改的文件(关闭一个自动打开下一个)
git difftool HEAD -- readme.txt 比较ready.text的修改情况
配置方法如下:
2.1:在terminal中执行如下命令:
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
再在下面的配置中添上
[difftool]
prompt = false
即可
2.2:或者在~/.gitconfig中添加如下代码。
[diff]
tool = diffmerge
[difftool "bc3"]
cmd = /usr/bin/bcompare \"$LOCAL\" \"$REMOTE\"
[merge]
tool = diffmerge
[difftool]
prompt = false
[mergetool "bc3"]
cmd = /usr/bin/bcompare \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
[difftool "diffmerge"]
cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
[mergetool "diffmerge"]
cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
trustExitCode = true
常用命令介绍:
git diff 与git difftool 的命令一样,下面罗列常用命令:
git diff 默认查看当前修改且没有add的内容
git diff --cached 查看已经add 并且没有commit的内容
git diff HEAD 查看上面两种条件的并集
git diff versinnum1 versinnum2: 比较两个版本号码文件的修改差异