mergetool: document the default for --[no-]prompt
The original motivation of using the prompt was to confirm to run a tool on this particular (as opposed to another) path, but the user can also take the prompt as to confirm to run this (as opposed to some other) tool. The latter of which of course is irritating for those who told which exact tool to use, which is the reason why we are flipping the default. During the review discussion of the patch, many people (including the maintainer) missed that a user can find the prompt useful way to skip running the tool on particular paths. Clarify it by adding a brief half-sentence to the description. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 23, 2014 at 10:07 UTC
c15bb0cad73e4dad52a6d4869a254baf3a689b6a
1 file changed
+5
-3
Documentation/git-mergetool.txt
+5
-3
@@ -71,11 +71,13 @@ success of the resolution after the custom tool has exited.
71
--no-prompt::
72
Don't prompt before each invocation of the merge resolution
73
program.
74
+ This is the default if the merge resolution program is
75
+ explicitly specified with the `--tool` option or with the
76
+ `merge.tool` configuration variable.
77
78
--prompt::
76
- Prompt before each invocation of the merge resolution program.
77
- This is the default behaviour; the option is provided to
78
- override any configuration settings.
79
+ Prompt before each invocation of the merge resolution program
80
+ to give the user a chance to skip the path.
81
82
TEMPORARY FILES
83
---------------