How do I view 'git diff' output with my preferred diff tool/ viewer?
When I type git diff , I want to view the output with my visual diff tool of choice (SourceGear "diffmerge" on Windows). How do I configure git to do this?
Since Git1.6.3, you can use the git difftool script : see my answer below.
May be this article will help you. Here are the best parts:
There are two different ways to specify an external diff tool.
The first is the method you used, by setting the GIT_EXTERNAL_DIFF variable. However, the variable is supposed to point to the full path of the executable. Moreover, the executable specified by GIT_EXTERNAL_DIFF will be called with a fixed set of 7 arguments:
path old-file old-hex old-mode new-file new-hex new-mode
As most diff tools will require a different order (and only some) of the arguments, you will most likely have to specify a wrapper script instead, which in turn calls the real diff tool.
The second method, which I prefer, is to configure the external diff tool via "git config" . Here is what I did:
1) Create a wrapper script "git-diff-wrapper.sh" which contains something like
-->8-(snip)--
#!/bin/sh
# diff is called by git with 7 parameters:
# path old-file old-hex old-mode new-file new-hex new-mode
"<path_to_diff_executable>" "$2" "$5" | cat
--8<-(snap)--
As you can see, only the second ("old-file") and fifth ("new-file") arguments will be passed to the diff tool.
2) Type
$ git config --global diff.external <path_to_wrapper_script>
at the command prompt, replacing with the path to "git-diff-wrapper.sh", so your ~/.gitconfig contains
-->8-(snip)--
[diff]
external = <path_to_wrapper_script>
--8<-(snap)--
Be sure to use the correct syntax to specify the paths to the wrapper script and diff tool, ie use forward slashed instead of backslashes. In my case, I have
[diff]
external = "c:/Documents and Settings/sschuber/git-diff-wrapper.sh"
in .gitconfig and
"d:/Program Files/Beyond Compare 3/BCompare.exe" "$2" "$5" | cat
in the wrapper script. Mind the trailing "cat"!
(I suppose the ' | cat ' is needed only for some programs which may not return a proper or consistent return status. You might want to try without the trailing cat if your diff tool has explicit return status)
That (the article quoted above) is the theory for external tool defined through config file (not through environment variable).
In practice (still for config file definition of external tool), you can refer to:
To complete my previous "diff.external" config answer above:
As mentioned by Jakub, Git1.6.3 introduced git difftool , originally proposed in September 2008:
USAGE= '[--tool=tool] [--commit=ref] [--start=ref --end=ref] [--no-prompt] [file to merge]'
(See --extcmd in the last part of this answer)
$LOCAL contains the contents of the file from the starting revision and $REMOTE contains the contents of the file in the ending revision.
$BASE contains the contents of the file in the wor
It's basically git-mergetool modified to operate on the git index/worktree.
The usual use case for this script is when you have either staged or unstaged changes and you'd like to see the changes in a side-by-side diff viewer (eg xxdiff , tkdiff , etc).
git difftool [<filename>*]
Another use case is when you'd like to see the same information but are comparing arbitrary commits (this is the part where the revarg parsing could be better)
git difftool --start=HEAD^ --end=HEAD [-- <filename>*]
The last use case is when you'd like to compare your current worktree to something other than HEAD (eg a tag)
git difftool --commit=v1.0.0 [-- <filename>*]
Note: since Git 2.5, git config diff.tool winmerge is enough!
See "git mergetool winmerge"
And since Git 1.7.11, you have the option --dir-diff , in order to to spawn external diff tools that can compare two directory hierarchies at a time after populating two temporary directories, instead of running an instance of the external tool once per a file pair.
Before Git 2.5:
Practical case for configuring difftool with your custom diff tool:
C:myGitRepo>git config --global diff.tool winmerge
C:myGitRepo>git config --global difftool.winmerge.cmd "winmerge.sh "$LOCAL" "$REMOTE""
C:myGitRepo>git config --global difftool.prompt false
With winmerge.sh stored in a directory part of your PATH:
#!/bin/sh
echo Launching WinMergeU.exe: $1 $2
"C:/Program Files/WinMerge/WinMergeU.exe" -u -e "$1" "$2" -dl "Local" -dr "Remote"
If you have another tool (kdiff3, P4Diff, ...), create another shell script, and the appropriate difftool.myDiffTool.cmd config directive.
Then you can easily switch tools with the diff.tool config.
You have also this blog entry by Dave to add other details.
(Or this question for the winmergeu options)
The interest with this setting is the winmerge.sh script : you can customize it to take into account special cases.
See for instance David Marble's answer below for an example which deals with:
As Kem Mason mentions in his answer, you can also avoid any wrapper by using the --extcmd option :
--extcmd=<command>
Specify a custom command for viewing diffs. git-difftool ignores the configured defaults and runs $command $LOCAL $REMOTE when this option is specified.
For instance, this is how gitk is able to run/use any diff tool.
In the spirit of answering questions that are somewhat different than asked. Try this solution:
$ meld my_project_using_git
Meld understands git and provides navigating around the recent changes.
链接地址: http://www.djcxy.com/p/41954.html上一篇: p4merge错误[GIT]