Re: [PATCH] pull: clarify advice for the unconfigured error case

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Dec 3, 2009, 01:26 UTC
Message-ID: <20091203012535.GA16259@progeny.tock>
In-Reply-To: <7vk4x57z4e.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:

Show 7 quoted lines

> Jonathan Nieder <jrnieder@gmail.com> writes:
>
>> From: Jan Krüger <jk@jk.gs>
>>
>> When pull --rebase fails because it cannot find what branch to
>> merge against, the error message implies we are trying to merge.
>> Say "rebase against" instead of "merge with" to avoid confusion.

[...]

> Is this a good replacement for 31971b3 (git-pull.sh --rebase: overhaul
> error handling when no candidates are found, 2009-11-12) that is on 'pu'

Yes, that is the intent.

> and does the lack of follow-up mean everybody involved in the discussion
> is happy with this version?

I’m not sure.  I know I like it. :-)

I was the only one with nitpicks about the wording (sorry). Re whether to use configuration file syntax or a 'git config' command line snippet, it seemed like there was some consensus once it was clear that the user would have to modify the lines anyway to fill in the right values. But others can speak up if this seems wrong.

Hope that helps, Jonathan