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 <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David Aguilar committed
Aug 10, 2012 at 00:39 UTC
7a30747fbacd9a2059e861cba80ebd67685ffe80
2 files changed
+6
-3
Documentation/git-difftool.txt
+3
-3
@@ -66,6 +66,9 @@ of the diff post-image. `$MERGED` is the name of the file which is
66
being compared. `$BASE` is provided for compatibility
67
with custom merge tool commands and has the same value as `$MERGED`.
68
69
+--tool-help::
70
+ Print a list of diff tools that may be used with `--tool`.
71
+
72
--symlinks::
73
--no-symlinks::
74
'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`.
77
Specifying `--no-symlinks` instructs 'git difftool' to create
78
copies instead. `--no-symlinks` is the default on Windows.
79
77
---tool-help::
78
- Print a list of diff tools that may be used with `--tool`.
79
-
80
-x <command>::
81
--extcmd=<command>::
82
Specify a custom command for viewing diffs.
Documentation/git-mergetool.txt
+3
@@ -64,6 +64,9 @@ variable `mergetool.<tool>.trustExitCode` can be set to `true`.
64
Otherwise, 'git mergetool' will prompt the user to indicate the
65
success of the resolution after the custom tool has exited.
66
67
+--tool-help::
68
+ Print a list of merge tools that may be used with `--tool`.
69
+
70
-y::
71
--no-prompt::
72
Don't prompt before each invocation of the merge resolution