On Sun, Aug 26, 2007 at 02:26:27PM -0700, Junio C Hamano wrote: > Thanks. I'd imagined just I'd just merge your master and > everything would be fine, as your maint would be an ancestor of > your maint. And it indeed went fine ;-) Actually, the reason I mentioned it was because the stuff in my maint applies to your maint. So you probably want to pull into your maint as well, right? At least, that's my understanding from http://marc.info/?l=git&m=117306448427126&w=2 of how you wanted this to work. --b. - 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