From: David Aguilar Date: Fri, 10 Aug 2012 07:39:22 +0000 (-0700) Subject: mergetool,difftool: Document --tool-help consistently X-Git-Tag: v1.8.0-rc0~129^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a30747fbacd9a2059e861cba80ebd67685ffe80;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 313d54e18d..73ca7025a3 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -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 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:: --no-symlinks:: '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 copies instead. `--no-symlinks` is the default on Windows. ---tool-help:: - Print a list of diff tools that may be used with `--tool`. - -x :: --extcmd=:: Specify a custom command for viewing diffs. diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 2a49de7cfe..77dfdab2de 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -64,6 +64,9 @@ variable `mergetool..trustExitCode` can be set to `true`. Otherwise, 'git mergetool' will prompt the user to indicate the 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:: --no-prompt:: Don't prompt before each invocation of the merge resolution