diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-27 14:11:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-27 14:11:23 -0700 |
| commit | a00504d4382d1ae561f4199e9d3bcf65a8045ecd (patch) | |
| tree | 02c2f48bdefba25f947ea52b29fdddda57f18f5d /git-mergetool.txt | |
| parent | b9dc76c4ad0987d352a0d26620978a14e8f09714 (diff) | |
| download | git-htmldocs-a00504d4382d1ae561f4199e9d3bcf65a8045ecd.tar.gz | |
Autogenerated HTML docs for v1.7.12-116-g31e0100
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index d7207bd9b..6b563c500 100644 --- a/git-mergetool.txt +++ b/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 |