我已经将git设置为使用P4Merge作为diff工具,如here所述。所以,git diff
会触发P4Merge。多重差异工具
但是,有时我发现使用UNIX diff
更快,更高效(因为不涉及GUI)。我如何设置git,以便我可以轻松选择要触发的差异工具?这可能吗?例如:
$ git diff # to trigger P4Merge
$ git difftool # to trigger UNIX diff
我git config --list
:
code.editor=vi
merge.tool=p4merge
mergetool.extMerge.cmd=extMerge $BASE $LOCAL $REMOTE $MERGED
mergetool.extMerge.trustexitcode=false
diff.external=extDiff
mergetool.prompt=false
mergetool.keepbackup=false
mergetool.p4merge.path=/usr/local/bin/p4merge
上面提到的网址*已损坏,请您更新? – realPK 2014-08-15 00:49:58