From: Matthieu Moy Date: Sat, 23 Oct 2010 19:53:46 GMT Subject: Re: [PATCH 08/10] Use 'remote-tracking branch' in generated merge messages Message-ID: In-Reply-To: <20101023190441.GK21040@burratino> Jonathan Nieder writes: > Matthieu Moy wrote: > >> [Subject: [PATCH 08/10] Use 'remote-tracking branch' in generated merge messages] > > Maybe this should be squashed with the corresponding "git fetch" hunk > in 7/10 for bisectability. Actually, the "git fetch" hunk is not directly used by fmt-merge-msg, it is parsed, and re-pretty-printed. I'm not sure I understood all the details of the code, but the tests do pass between patch 7 and patch 8. -- Matthieu Moy http://www-verimag.imag.fr/~moy/