From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Elijah Newren <newren@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com, santi@agolina.net
Subject: Re: [PATCHv5 0/2] Fix spurious conflicts with pull --rebase
Date: Fri, 13 Aug 2010 01:48:52 +0000 [thread overview]
Message-ID: <AANLkTi=9Mqyoc5jjMOZJVNGY0e=DqZUr7ays=WOcr2tN@mail.gmail.com> (raw)
In-Reply-To: <1281664250-2703-1-git-send-email-newren@gmail.com>
This looks very good, and has a great code/test ratio.
next prev parent reply other threads:[~2010-08-13 1:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-13 1:50 [PATCHv5 0/2] Fix spurious conflicts with pull --rebase Elijah Newren
2010-08-13 1:48 ` Ævar Arnfjörð Bjarmason [this message]
2010-08-13 1:50 ` [PATCHv5 1/2] t5520-pull: Add testcases showing spurious conflicts from git " Elijah Newren
2010-08-13 1:50 ` [PATCHv5 2/2] pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches 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='AANLkTi=9Mqyoc5jjMOZJVNGY0e=DqZUr7ays=WOcr2tN@mail.gmail.com' \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@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).