path: root/contrib/difftool/git-difftool.txt
diff options
authorDavid Aguilar <>2009-04-07 08:21:19 (GMT)
committerJunio C Hamano <>2009-04-08 05:19:55 (GMT)
commit8b7332221db8522fe23bf8cf25d058acea6b9142 (patch)
treeb5fce531955bdb5f945091fd820298be6d9daab7 /contrib/difftool/git-difftool.txt
parent46ae156d6c8c48d521e4d858ed84d93259cfc61f (diff)
difftool: add a -y shortcut for --no-prompt
This is another consistency cleanup to make git-difftool's options match git-mergetool. Signed-off-by: David Aguilar <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'contrib/difftool/git-difftool.txt')
1 files changed, 14 insertions, 22 deletions
diff --git a/contrib/difftool/git-difftool.txt b/contrib/difftool/git-difftool.txt
index 2b7bc03..a00e943 100644
--- a/contrib/difftool/git-difftool.txt
+++ b/contrib/difftool/git-difftool.txt
@@ -3,35 +3,32 @@ git-difftool(1)
-git-difftool - compare changes using common merge tools
+git-difftool - Show changes using common diff tools
-'git difftool' [--tool=<tool>] [--no-prompt] ['git diff' options]
+'git difftool' [--tool=<tool>] [-y|--no-prompt] [<'git diff' options>]
'git-difftool' is a git command that allows you to compare and edit files
-between revisions using common merge tools. At its most basic level,
-'git-difftool' does what 'git-mergetool' does but its use is for non-merge
-situations such as when preparing commits or comparing changes against
-the index.
-'git difftool' is a frontend to 'git diff' and accepts the same
-arguments and options.
-See linkgit:git-diff[1] for the full list of supported options.
+between revisions using common diff tools. 'git difftool' is a frontend
+to 'git-diff' and accepts the same options and arguments.
+ Do not prompt before launching a diff tool.
-t <tool>::
- Use the merge resolution program specified by <tool>.
+ Use the diff tool specified by <tool>.
Valid merge tools are:
kdiff3, kompare, tkdiff, meld, xxdiff, emerge,
vimdiff, gvimdiff, ecmerge, and opendiff
-If a merge resolution program is not specified, 'git-difftool'
+If a diff tool is not specified, 'git-difftool'
will use the configuration variable `diff.tool`. If the
configuration variable `diff.tool` is not set, 'git-difftool'
will pick a suitable default.
@@ -42,7 +39,7 @@ can configure the absolute path to kdiff3 by setting
`difftool.kdiff3.path`. Otherwise, 'git-difftool' assumes the
tool is available in PATH.
-Instead of running one of the known merge tool programs,
+Instead of running one of the known diff tools,
'git-difftool' can be customized to run an alternative program
by specifying the command line to invoke in a configuration
variable `difftool.<tool>.cmd`.
@@ -56,8 +53,7 @@ is set to the name of the temporary file containing the contents
of the diff post-image. `$BASE` is provided for compatibility
with custom merge tool commands and has the same value as `$LOCAL`.
- Do not prompt before launching a diff tool.
+See linkgit:git-diff[1] for the full list of supported options.
@@ -65,21 +61,17 @@ CONFIG VARIABLES
difftool equivalents have not been defined.
- The default merge tool to use.
+ The default diff tool to use.
Override the path for the given tool. This is useful in case
your tool is not in the PATH.
- Specify the command to invoke the specified merge tool.
+ Specify the command to invoke the specified diff tool.
See the `--tool=<tool>` option above for more details.
- The original, unedited file content can be saved to a file with
- a `.orig` extension. Defaults to `true` (i.e. keep the backup files).