From 7a30747fbacd9a2059e861cba80ebd67685ffe80 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Fri, 10 Aug 2012 00:39:22 -0700 Subject: 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 --- Documentation/git-mergetool.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Documentation/git-mergetool.txt') 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 -- cgit v1.2.1