mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergetool,difftool: Document --tool-help consistently

Browse Source 
Add an entry for --tool-help to the mergetool documentation.

Move --tool-help in the difftool documentation so that it is
listed immediately after --tool so that it is easier to find.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David Aguilar
2012-08-10 00:39:22 -07:00
committed by Junio C Hamano
parent 190f5475f2
commit 7a30747fba
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/git-difftool.txt
View File

@ -66,6 +66,9 @@ of the diff post-image. `$MERGED` is the name of the file which is
being compared. `$BASE` is provided for compatibility being compared. `$BASE` is provided for compatibility
with custom merge tool commands and has the same value as `$MERGED`. 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`.
--symlinks:: --symlinks::
--no-symlinks:: --no-symlinks::
'git difftool''s default behavior is create symlinks to the 'git difftool''s default behavior is create symlinks to the
@ -74,9 +77,6 @@ with custom merge tool commands and has the same value as `$MERGED`.
Specifying `--no-symlinks` instructs 'git difftool' to create Specifying `--no-symlinks` instructs 'git difftool' to create
copies instead. `--no-symlinks` is the default on Windows. copies instead. `--no-symlinks` is the default on Windows.
--tool-help::
Print a list of diff tools that may be used with `--tool`.
-x <command>:: -x <command>::
--extcmd=<command>:: --extcmd=<command>::
Specify a custom command for viewing diffs. Specify a custom command for viewing diffs.

3
Documentation/git-mergetool.txt
View File

@ -64,6 +64,9 @@ variable `mergetool.<tool>.trustExitCode` can be set to `true`.
Otherwise, 'git mergetool' will prompt the user to indicate the Otherwise, 'git mergetool' will prompt the user to indicate the
success of the resolution after the custom tool has exited. success of the resolution after the custom tool has exited.
--tool-help::
Print a list of merge tools that may be used with `--tool`.
-y:: -y::
--no-prompt:: --no-prompt::
Don't prompt before each invocation of the merge resolution Don't prompt before each invocation of the merge resolution