From: Elijah Newren Date: Fri, 13 Aug 2010 01:47:11 GMT Subject: Re: [PATCHv4 2/2] pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches Message-ID: In-Reply-To: <7vhbizpirg.fsf@alter.siamese.dyndns.org> On Thu, Aug 12, 2010 at 4:29 PM, Junio C Hamano wrote: > Elijah Newren 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. Ok, sent.