From: Jeff King <peff@peff.net>
To: Jacob Keller <jacob.e.keller@intel.com>
Cc: git@vger.kernel.org, Mike Hommey <mh@glandium.org>,
Johan Herland <johan@herland.net>,
Michael Haggerty <mhagger@alum.mit.edu>,
Junio C Hamano <gitster@pobox.com>,
Jacob Keller <jacob.keller@gmail.com>
Subject: Re: [PATCH] notes: allow merging from arbitrary references
Date: Tue, 24 Nov 2015 18:42:06 -0500 [thread overview]
Message-ID: <20151124234206.GA31949@sigill.intra.peff.net> (raw)
In-Reply-To: <20151124224709.GA13691@sigill.intra.peff.net>
On Tue, Nov 24, 2015 at 05:47:09PM -0500, Jeff King wrote:
> On Fri, Nov 13, 2015 at 08:34:22AM -0800, Jacob Keller wrote:
>
> > ---
> > I do not remember what version this was since it has been an age ago
> > that I sent the previous code. This is mostly just a rebase onto current
> > next. I believe I have covered everything previous reviewers noted.
>
> Please keep topics branched from master where possible. And if not
> possible, please indicate which topic in 'next' is required to build on.
>
> We never merge 'next' itself, only individual topics from it. So I can't
> just apply your patch on top of 'next'.
>
> I did get it to apply on the current master with "am -3", but some tests
> in t3310 seem to fail. Can you take a look?
I just noticed v2, which I missed earlier. But the same complaints
apply. :)
-Peff
next prev parent reply other threads:[~2015-11-24 23:42 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-13 16:34 [PATCH] notes: allow merging from arbitrary references Jacob Keller
2015-11-15 22:14 ` Johan Herland
2015-11-15 23:23 ` Jacob Keller
2015-11-16 7:55 ` Johan Herland
2015-11-16 19:41 ` Jacob Keller
2015-11-18 22:29 ` Johan Herland
2015-11-18 22:38 ` Jacob Keller
2015-11-24 22:47 ` Jeff King
2015-11-24 23:42 ` Jeff King [this message]
2015-11-26 6:20 ` Jacob Keller
2015-12-11 19:47 ` Junio C Hamano
2015-12-11 19:58 ` Jacob Keller
-- strict thread matches above, loose matches on Subject: below --
2015-12-28 18:19 Jacob Keller
2015-12-28 23:42 ` Junio C Hamano
2015-12-29 2:56 ` Jacob Keller
2015-12-29 18:28 ` Junio C Hamano
2015-10-01 22:39 Jacob Keller
2015-10-01 22:51 ` Jacob Keller
2015-10-08 0:28 ` Jacob Keller
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151124234206.GA31949@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.e.keller@intel.com \
--cc=jacob.keller@gmail.com \
--cc=johan@herland.net \
--cc=mh@glandium.org \
--cc=mhagger@alum.mit.edu \
/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.
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 NNTP newsgroup(s).