I'm wondering if there is a way to setup git and diffmerge so that when you execute the following command: git difftool
diffmerge pop开发者_如何学JAVAs up and shows you a file listing of all the modified files instead of cycling through them via the command-line?
I'm thinking it must be some setting the ~/.gitconfig file. Here is my current ~/.gitconfig:
[merge]
tool = diffmerge
[mergetool "diffmerge"]
cmd = /Applications/DiffMerge.app/Contents/MacOS/diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
[mergetool]
keepBackup = false
[diff]
tool = diffmerge
[difftool "diffmerge"]
cmd = /Applications/DiffMerge.app/Contents/MacOS/diffmerge $LOCAL $REMOTE
See below for Mercurials (HG) way of presenting DiffMerge.
You should have the following lines in your .gitconfig
:
[diff]
tool = diffmerge
[difftool "diffmerge"]
cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge \"$LOCAL\" \"$REMOTE\"
Git does not provide directory diffs in its default setup. See this related SO question:
git difftool, open all diff files immediately, not in serial
Also, see the git diffall project on GitHub which implements this feature as an add-on script.
Note that you now can (git 1.7.11) diff directories (ie display all the files to be compared, before opening the difftool)
See "git difftool
to give directory compare?"
In other words, git now does "inherently handle folder diffs."
Take a look at the question and answer here for details regarding setting up git with diffmerge:
Problem with git + DiffMerge on OS X
精彩评论