From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Santi Béjar" <santi@agolina.net>,
git@vger.kernel.org, Johannes.Schindelin@gmx.de,
martinvz <martin.von.zweigbergk@gmail.com>
Subject: Re: [PATCHv4 2/2] pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
Date: Thu, 12 Aug 2010 19:47:11 -0600 [thread overview]
Message-ID: <AANLkTi=hJMCVP4sfSr6Ru82aXVoj6OcLxKaj-cV_1GJ1@mail.gmail.com> (raw)
In-Reply-To: <7vhbizpirg.fsf@alter.siamese.dyndns.org>
On Thu, Aug 12, 2010 at 4:29 PM, Junio C Hamano <gitster@pobox.com> wrote:
> 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.
Ok, sent.
prev parent reply other threads:[~2010-08-13 1:47 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-12 5:56 [PATCHv4 0/2] Fix spurious conflicts with pull --rebase Elijah Newren
2010-08-12 5:56 ` [PATCHv4 1/2] t5520-pull: Add testcases showing spurious conflicts from git " Elijah Newren
2010-08-12 5:56 ` [PATCHv4 2/2] pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches Elijah Newren
2010-08-12 13:34 ` Santi Béjar
2010-08-12 14:37 ` Santi Béjar
2010-08-12 14:40 ` Santi Béjar
2010-08-12 21:02 ` Elijah Newren
2010-08-12 22:51 ` Santi Béjar
2010-08-12 20:19 ` Elijah Newren
2010-08-12 22:08 ` Santi Béjar
2010-08-12 23:17 ` Santi Béjar
2010-08-12 22:29 ` Junio C Hamano
2010-08-13 1:47 ` Elijah Newren [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='AANLkTi=hJMCVP4sfSr6Ru82aXVoj6OcLxKaj-cV_1GJ1@mail.gmail.com' \
--to=newren@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.von.zweigbergk@gmail.com \
--cc=santi@agolina.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).