Michael Haggerty <mhagger@xxxxxxxxxxxx> writes: > On 11/17/2011 06:55 AM, Junio C Hamano wrote: >> As a tentative measure, for tonight's pushout, I am inclined to queue an >> equivalent of this patch on top of both mh/ref-api-2 and mh/ref-api-3 >> topic and merge them to 'next' and 'pu'. I'd appreciate if you can double >> check the two merges on master..pu after I push them out in a few hours. > > I checked the merges in the following... Sorry, what I meant was eyeballing these two merges aee9699 Merge branch 'mh/ref-api-3' into jch 9f8b195 Merge branch 'mh/ref-api-2' into jch in "git log --oneline --first-parent master..pu" to see if I screwed them up. Going forward, I think after 1.7.8 final is tagged, when rewinding and rebuilding the 'next' branch, it would be ideal to rebase these two topics (actually, -3 builds on top of -2, so rebasing only the lower one should be sufficient) on top of 1.7.8 that will include the fix in the patch that started this thread. -- 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