On Mon, Feb 18, 2013 at 07:27:50AM -0500, W. Trevor King wrote: > On Mon, Feb 18, 2013 at 12:56:07AM -0800, Junio C Hamano wrote: > > I've taken the following to 'maint'… > > Should I rebase v4 onto maint so I don't accidentally collide with any > of the previous patches which have already been merged there?
I tried this, but the backtick patch shouldn't move to maint due to: On Sun, Feb 10, 2013 at 05:36:32PM -0500, W. Trevor King wrote: > I based my changes on `master` to avoid colliding with 2de9b711 > (Documentation: the name of the system is 'Git', not 'git', > 2013-01-21), but if you shifted them already I suppose you've fixed > any conflicts ;). I'll drop it for now, and revive it after the next release syncs master and maint. I've rebased the remaining patches onto `maint`. -- This email may be signed or encrypted with GnuPG (http://www.gnupg.org). For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy
Description: OpenPGP digital signature