git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCHv4 2/2] pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 12, 2010, 22:29 UTC
Message-ID
<7vhbizpirg.fsf@alter.siamese.dyndns.org>
In-Reply-To
<AANLkTimoB=__-FmuFYa_rKqMjoYwWQS9hzziuk9Jseyx@mail.gmail.com>
Elijah Newren <newren@gmail.com> writes:
Show 14 quoted lines
>> 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.

Previous: Santi BéjarNext: Elijah Newren
Message 12 of 13 in “[PATCHv4 0/2] Fix spurious conflicts with pull --rebase”
  1. Elijah NewrenAug 12, 2010
  2. 1/2 t5520-pull: Add testcases showing spurious conflicts from git pull --rebaseElijah Newren, Aug 12, 2010
  3. 2/2 pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesElijah Newren, Aug 12, 2010
  4. Santi BéjarAug 12, 2010
  5. Santi BéjarAug 12, 2010
  6. Santi BéjarAug 12, 2010
  7. Elijah NewrenAug 12, 2010
  8. Santi BéjarAug 12, 2010
  9. Elijah NewrenAug 12, 2010
  10. Santi BéjarAug 12, 2010
  11. Santi BéjarAug 12, 2010
  12. Junio C HamanoAug 12, 2010
  13. Elijah NewrenAug 13, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.