From: Marc Branchaud <marcnarc@xiplink•com>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH] Release notes grammatical fixes.
Date: Tue, 05 Aug 2014 17:57:19 -0400 [thread overview]
Message-ID: <53E1533F.7020601@xiplink.com> (raw)
In-Reply-To: <xmqq8un2pyk3.fsf@gitster.dls.corp.google.com>
On 14-08-05 02:43 PM, Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox•com> writes:
>
>> Marc Branchaud <marcnarc@xiplink•com> writes:
>> ...
>>> @@ -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.
>
> Perhaps this on top of yoru patch?
Yes, I think that's good, thanks.
M.
> Documentation/RelNotes/2.1.0.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/RelNotes/2.1.0.txt b/Documentation/RelNotes/2.1.0.txt
> index 4fd153e..1b16b12 100644
> --- a/Documentation/RelNotes/2.1.0.txt
> +++ b/Documentation/RelNotes/2.1.0.txt
> @@ -95,7 +95,7 @@ UI, Workflows & Features
>
> Strictly speaking, this is a backward incompatible change and
> users need to explicitly set the variable to 'true' if they want
> - to resurrect the old behaviour.
> + to be prompted to confirm running the tool on each path.
>
> * "git replace" learned the "--edit" subcommand to create a
> replacement by editing an existing object.
>
next prev parent reply other threads:[~2014-08-05 21:57 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-04 22:31 [ANNOUNCE] Git v2.1.0-rc1 Junio C Hamano
2014-08-04 23:41 ` Ramsay Jones
2014-08-05 16:30 ` Junio C Hamano
2014-08-05 16:50 ` [PATCH] Release notes grammatical fixes Marc Branchaud
2014-08-05 18:29 ` Junio C Hamano
2014-08-05 18:43 ` Junio C Hamano
2014-08-05 21:57 ` Marc Branchaud [this message]
2014-08-05 16:51 ` [ANNOUNCE] Git v2.1.0-rc1 Marc Branchaud
2014-08-05 18:31 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53E1533F.7020601@xiplink.com \
--to=marcnarc@xiplink$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox