From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Christopher Tiwald <christiwald@gmail.com>,
git@vger.kernel.org, zbyszek@in.waw.pl,
Matthieu.Moy@grenoble-inp.fr, drizzd@aon.at
Subject: Re: [PATCH v3] push: Provide situational hints for non-fast-forward errors
Date: Mon, 26 Mar 2012 16:11:22 -0400 [thread overview]
Message-ID: <20120326201122.GA24138@sigill.intra.peff.net> (raw)
In-Reply-To: <7vk427nn4v.fsf@alter.siamese.dyndns.org>
On Mon, Mar 26, 2012 at 01:05:52PM -0700, Junio C Hamano wrote:
> > Your patch is already in 'next', so we will have to build on top rather
> > than squashing. So here it is with an actual commit message:
>
> If the patch were already in 'next', we would have to build on top, but I
> thought I kept it out of 'next' because I knew this deserved a bit more
> review time. Perhaps I screwed up, or you are reading the history
> incorrectly?
>
> ... goes and looks ...
Oops, you're right. I don't know why I thought it was, and obviously I
should check before speaking next time. :)
> I'm however tempted to keep this follow-up patch as separate without
> squashing.
Either way is fine with me.
BTW, I was on a semi-vacation when Christopher posted the patch, so I
missed out on most of the timely review. But I really like how it ended
up; it's exactly what I was hoping for when we discussed this a month or
two ago. So thanks for working on it, Christopher.
-Peff
prev parent reply other threads:[~2012-03-26 20:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-20 4:31 [PATCH v3] push: Provide situational hints for non-fast-forward errors Christopher Tiwald
2012-03-20 5:47 ` Junio C Hamano
2012-03-23 21:41 ` Jeff King
2012-03-26 19:20 ` Christopher Tiwald
2012-03-26 19:51 ` Jeff King
2012-03-26 19:57 ` Christopher Tiwald
2012-03-26 20:00 ` Jeff King
2012-03-26 20:05 ` Junio C Hamano
2012-03-26 20:11 ` Jeff King [this message]
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=20120326201122.GA24138@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=christiwald@gmail.com \
--cc=drizzd@aon.at \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=zbyszek@in.waw.pl \
/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).