git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Santi Béjar" <santi@agolina.net>
To: Elijah Newren <newren@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com,
	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: Fri, 13 Aug 2010 01:17:32 +0200	[thread overview]
Message-ID: <AANLkTim6Tg7fNqxFYGU=bxQAn24ipkNaiENU5waCyQ4y@mail.gmail.com> (raw)
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:
> 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

  reply	other threads:[~2010-08-12 23:17 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 [this message]
2010-08-12 22:29       ` Junio C Hamano
2010-08-13  1:47         ` Elijah Newren

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='AANLkTim6Tg7fNqxFYGU=bxQAn24ipkNaiENU5waCyQ4y@mail.gmail.com' \
    --to=santi@agolina.net \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=martin.von.zweigbergk@gmail.com \
    --cc=newren@gmail.com \
    /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).