From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 12 Aug 2010 22:29:23 GMT
Subject: Re: [PATCHv4 2/2] pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
Message-ID: <7vhbizpirg.fsf@alter.siamese.dyndns.org>
In-Reply-To: <AANLkTimoB=__-FmuFYa_rKqMjoYwWQS9hzziuk9Jseyx@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

>> Can you refer to commits with something like this?
>>
>> c85c792 (pull --rebase: be cleverer with rebased upstream branches, 2008-01-26)
>
> Sure, I'll start doing that.
>
>> You've moved all the lines after the call to "git fetch". It changes
>> the behavior when the reflog is not enabled, as the old value of
>> remoteref is lost.
>
> Doh.  That's what I get for trying to 'clean up' some code and put all
> the references to setting oldremoteref together.  I should have stuck
> with my original 7-line addition patch.  I'll resend the simplified
> patch.

Then I'll wait for the re-roll of 2/2 with updated message and
corrected code; thanks.