Marc Branchaud <marcnarc@xxxxxxxxxxx> writes: > Signed-off-by: Marc Branchaud <marcnarc@xxxxxxxxxxx> > diff --git a/Documentation/RelNotes/2.1.0.txt b/Documentation/RelNotes/2.1.0.txt Many are indeed grammatical errors, and many others make the result easier to read, even if the original weren't incorrect per-se. > @@ -87,22 +87,20 @@ UI, Workflows & Features > * "git mergetool" learned to drive the vimdiff3 backend. > > * mergetool.prompt used to default to 'true', always asking "do you > - really want to run the tool on this path?". Among the two > - purposes this prompt serves, ignore the use case to confirm that > - the user wants to view particular path with the named tool, and > - redefine the meaning of the prompt only to confirm the choice of > - the tool made by the autodetection (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 > + really want to run the tool on this path?". The default has been > + changed to 'false'. However, the prompt will still appear if > + mergetool used its autodetection system to guess which tool to use. > + Users who explicitly specify or configure a tool will no longer see > + the prompt by default. > + > + Strictly speaking, this is a backward incompatible change and > users need to explicitly set the variable to 'true' if they want > - to resurrect the now-ignored use case. > + to resurrect the old behaviour. I however think you are losing information here. It is unclear in the rewritten one why you would ever want the "old" behaviour, i.e. what you may be missing by following along with this change. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html