diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-01-01 22:05:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-01-01 22:05:17 +0000 |
| commit | 10b7a34451b2849b893cd1002b8477307873ab30 (patch) | |
| tree | d44ce202644b2ba9d76f5457724bf6193dece835 /git-mergetool.txt | |
| parent | bbbb865819d5387ef9ee747115b30b5d2dc7e67b (diff) | |
| download | git-htmldocs-10b7a34451b2849b893cd1002b8477307873ab30.tar.gz | |
Autogenerated HTML docs for v1.6.1-35-g3827
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index 602e7c6d3..4c0ffec50 100644 --- a/git-mergetool.txt +++ b/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> |