Skip to content

Commit 7a30747

Browse files
davvidgitster
authored andcommitted
mergetool,difftool: Document --tool-help consistently
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 190f547 commit 7a30747

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Documentation/git-difftool.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ of the diff post-image. `$MERGED` is the name of the file which is
6666
being compared. `$BASE` is provided for compatibility
6767
with custom merge tool commands and has the same value as `$MERGED`.
6868

69+
--tool-help::
70+
Print a list of diff tools that may be used with `--tool`.
71+
6972
--symlinks::
7073
--no-symlinks::
7174
'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`.
7477
Specifying `--no-symlinks` instructs 'git difftool' to create
7578
copies instead. `--no-symlinks` is the default on Windows.
7679

77-
--tool-help::
78-
Print a list of diff tools that may be used with `--tool`.
79-
8080
-x <command>::
8181
--extcmd=<command>::
8282
Specify a custom command for viewing diffs.

Documentation/git-mergetool.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ variable `mergetool.<tool>.trustExitCode` can be set to `true`.
6464
Otherwise, 'git mergetool' will prompt the user to indicate the
6565
success of the resolution after the custom tool has exited.
6666

67+
--tool-help::
68+
Print a list of merge tools that may be used with `--tool`.
69+
6770
-y::
6871
--no-prompt::
6972
Don't prompt before each invocation of the merge resolution

0 commit comments

Comments
 (0)