diff options
| author | David Aguilar <davvid@gmail.com> | 2012-08-10 00:39:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-10 08:07:41 -0700 |
| commit | 7a30747fbacd9a2059e861cba80ebd67685ffe80 (patch) | |
| tree | 85648c18332a66ea72ff52f9b41744688d7247eb /Documentation/git-mergetool.txt | |
| parent | 190f5475f2a7edb777b65367d8796177aa13c830 (diff) | |
| download | git-7a30747fbacd9a2059e861cba80ebd67685ffe80.tar.gz | |
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>
Diffstat (limited to 'Documentation/git-mergetool.txt')
| -rw-r--r-- | Documentation/git-mergetool.txt | 3 |
1 files changed, 3 insertions, 0 deletions
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.<tool>.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 |