diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-10 11:45:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-10 11:45:15 -0700 |
| commit | bcdb12ed43f108ca2931dda48a9b772cd4efb5f5 (patch) | |
| tree | 5d6ea9a34c1a16b30b3a50d9538df86a4b92908b /git-difftool.txt | |
| parent | 22700fb0070b260261fc5003205fe9aa9e080ce5 (diff) | |
| download | git-htmldocs-bcdb12ed43f108ca2931dda48a9b772cd4efb5f5.tar.gz | |
Autogenerated HTML docs for v1.7.10.1-553-gb7fbc
Diffstat (limited to 'git-difftool.txt')
| -rw-r--r-- | git-difftool.txt | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/git-difftool.txt b/git-difftool.txt index fe38f667f..31fc2e3ae 100644 --- a/git-difftool.txt +++ b/git-difftool.txt @@ -19,6 +19,12 @@ linkgit:git-diff[1]. OPTIONS ------- +-d:: +--dir-diff:: + Copy the modified files to a temporary location and perform + a directory diff on them. This mode never prompts before + launching the diff tool. + -y:: --no-prompt:: Do not prompt before launching a diff tool. @@ -30,11 +36,9 @@ OPTIONS -t <tool>:: --tool=<tool>:: - Use the diff tool specified by <tool>. - Valid diff tools are: - araxis, bc3, deltawalker, diffuse, emerge, ecmerge, gvimdiff, - kdiff3, kompare, meld, opendiff, p4merge, tkdiff, vimdiff and - xxdiff. + Use the diff tool specified by <tool>. Valid values include + emerge, kompare, meld, and vimdiff. Run `git difftool --tool-help` + for the list of valid <tool> settings. + If a diff tool is not specified, 'git difftool' will use the configuration variable `diff.tool`. If the @@ -62,6 +66,9 @@ of the diff post-image. `$MERGED` is the name of the file which is being compared. `$BASE` is provided for compatibility with custom merge tool commands and has the same value as `$MERGED`. +--tool-help:: + Print a list of diff tools that may be used with `--tool`. + -x <command>:: --extcmd=<command>:: Specify a custom command for viewing diffs. |