Re: [PATCH] pull: require choice between rebase/merge on non-fast-forward pull

From: Junio C Hamano <gitster@pobox.com>
To: Fredrik Gustafsson <iveqy@iveqy.com>
Cc: git@vger.kernel.org,
	Linus Torvalds <torvalds@linux-foundation.org>,
	John Keeping <john@keeping.me.uk>, Andreas Krey <a.krey@gmx.de>,
	John Szakmeister <john@szakmeister.net>
Subject: Re: [PATCH] pull: require choice between rebase/merge on non-fast-forward pull
Date: Thu, 27 Jun 2013 13:49:42 -0700	[thread overview]
Message-ID: <7vzjubqnx5.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20130627201142.GC27497@paksenarrion.iveqy.com> (Fredrik Gustafsson's message of "Thu, 27 Jun 2013 22:11:42 +0200")

Fredrik Gustafsson <iveqy@iveqy.com> writes:

> On Thu, Jun 27, 2013 at 12:48:52PM -0700, Junio C Hamano wrote:
> <snip>
>> +# See if we are configured to rebase by default.
>> +# The value $rebase is, throughout the main part of the code:
>> +#    (empty) - the user did not have any preference
>> +#    true    - the user told us to integrate by rebasing
>> +#    flase   - the user told us to integrate by merging
>
> s/flase/false

Thanks.

> And isn't all config settings documented somewhere?

Yes, but the above does not have anything to do with it.  It is how
the variable in this script gets used---it may come from the config,
but it will be overridden by command line option.

If you do "git config pull.rebase false", it is an explicit show of
preference to do "pull --merge".

If you do not have any pull.rebase in your configuration, *and* if
your command line does not say "pull --merge" nor "pull --rebase",
then $rebase will be empty, and that is how we detect that you
haven't given us any explicit preference (yet) and fail the command.