From: Sverre Rabbelier Date: Mon, 30 Nov 2009 08:09:22 GMT Subject: Re: [PATCH v3] Give the hunk comment its own color Message-ID: In-Reply-To: <7vtywcwj1o.fsf@alter.siamese.dyndns.org> Heya, On Mon, Nov 30, 2009 at 08:47, Junio C Hamano wrote: > I'll merge the updated (i.e. rewound and then rebuilt) tip > of the topic branch when the topic graduates to the master (hopefully > before 1.6.6-rc1), so we won't see the botched one in the end result. I'm curious how you do this. Do you keep a list of replacements, that is "when merging branch foo from next to master, instead merge bar", or is it something the original author should remind you of when it's time to merge to master? -- Cheers, Sverre Rabbelier