| commit | c15bb0cad73e4dad52a6d4869a254baf3a689b6a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 23 Apr 2014 17:07:20 +0000 (23 10:07 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 24 Apr 2014 18:29:05 +0000 (24 11:29 -0700) | ||
| tree | 004fe0ffaa644c708a55fc27549f1639a2871dee | treesnapshot (tar.gz zip) |
| parent | 4ecc63d7f982aa65038048bcdaf49e99b428b028 | commitdiff |
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>
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>
| Documentation/git-mergetool.txt | diffblobblamehistory |