diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-01 05:48:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-01 05:48:40 -0800 |
| commit | 3827210b91a7d363ea67bcf0b9c6ee1c91d2f3c5 (patch) | |
| tree | d142cd6449c93a48abd928ddeb809d23c952d08f /Documentation/git-mergetool.txt | |
| parent | 42e778bfec68d251b777c6b8444cda4bc51332be (diff) | |
| parent | 162eba8b43a0e665c8e3439191981412815cc6db (diff) | |
| download | git-3827210b91a7d363ea67bcf0b9c6ee1c91d2f3c5.tar.gz | |
Merge branch 'cb/mergetool'
* cb/mergetool:
mergetool: Don't keep temporary merge files unless told to
mergetool: Add prompt to continue after failing to merge a file
Add -y/--no-prompt option to mergetool
Fix some tab/space inconsistencies in git-mergetool.sh
Diffstat (limited to 'Documentation/git-mergetool.txt')
| -rw-r--r-- | Documentation/git-mergetool.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 602e7c6d3b..4c0ffec507 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -7,7 +7,7 @@ git-mergetool - Run merge conflict resolution tools to resolve merge conflicts SYNOPSIS -------- -'git mergetool' [--tool=<tool>] [<file>]... +'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>]... DESCRIPTION ----------- @@ -60,6 +60,15 @@ 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. +-y or --no-prompt:: + Don't prompt before each invocation of the merge resolution + program. + +--prompt:: + Prompt before each invocation of the merge resolution program. + This is the default behaviour; the option is provided to + override any configuration settings. + Author ------ Written by Theodore Y Ts'o <tytso@mit.edu> |