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
SBSanti Béjar <santi@agolina.net>
Date
Aug 12, 2010, 23:17 UTC
Message-ID
<AANLkTim6Tg7fNqxFYGU=bxQAn24ipkNaiENU5waCyQ4y@mail.gmail.com>
In-Reply-To
<AANLkTikt6kRZRGW5Y=0qFf41P2HVLe97qGH=5ya5gcbw@mail.gmail.com>
On Fri, Aug 13, 2010 at 12:08 AM, Santi Béjar <santi@agolina.net> wrote:
Show 19 quoted lines
> On Thu, Aug 12, 2010 at 10:19 PM, Elijah Newren <newren@gmail.com> wrote:
>> Hi,
>>
>> Thanks for the review and comments!
>>
>> On Thu, Aug 12, 2010 at 7:34 AM, Santi Béjar <santi@agolina.net> wrote:
>> <snip>
>>> All this makes sense.
>>>
>>> But can you explain when it happens? One possibility is when you don't
>>> fork from the tracking branch as in:
>>
>> That's one possibility.  Patch 1/2 in this thread contains testcases
>> for two others.  Another possibility is having your patches get
>> upstream by some alternative route (e.g. pulling your changes to a
>> third machine, pushing from there, and then going back to your
>> original machine and trying to pull --rebase).
>
> I think this is commit message material.

I just want to add one thing, thanks for your great commit message. Although the patch itself if 7 lines it is fantastic to have a commit message explaining all the historical context and this level of detail.

Thanks, Santi

Previous: Santi BéjarNext: Junio C Hamano
Message 11 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.