diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-03 12:06:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-03 12:06:44 -0700 |
| commit | 7ea60c15cc98ab586aea77c256934acd438c7f95 (patch) | |
| tree | c581b239af31427001ddc9e6d23243f167cf9947 /Documentation | |
| parent | Merge branch 'mm/mediawiki-encoding-fix' (diff) | |
| parent | mergetool: document the default for --[no-]prompt (diff) | |
| download | tgif-7ea60c15cc98ab586aea77c256934acd438c7f95.tar.xz | |
Merge branch 'fc/mergetool-prompt'
mergetool.prompt used to default to 'true', always causing a confirmation
"do you really want to run the tool on this path" to be shown.
Among the two purposes the prompt serves, ignore the use case to
confirm that the user wants to view particular path with the named
tool, and make the prompt only to confirm the choice of the tool
made by autodetection and defaulting. For those who configured the
tool explicitly, the prompt shown for the latter purpose is simply
annoying.
Strictly speaking, this is a backward incompatible change and the
users need to explicitly set the variable to 'true' if they want to
resurrect the now-ignored use case.
* fc/mergetool-prompt:
mergetool: document the default for --[no-]prompt
mergetool: run prompt only if guessed tool
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-mergetool.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 07137f252b..e846c2ed7f 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -71,11 +71,13 @@ success of the resolution after the custom tool has exited. --no-prompt:: Don't prompt before each invocation of the merge resolution program. + This is the default if the merge resolution program is + explicitly specified with the `--tool` option or with the + `merge.tool` configuration variable. --prompt:: - Prompt before each invocation of the merge resolution program. - This is the default behaviour; the option is provided to - override any configuration settings. + Prompt before each invocation of the merge resolution program + to give the user a chance to skip the path. TEMPORARY FILES --------------- |