Re: [PATCH v3] push: Provide situational hints for non-fast-forward errors

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]