Jeff King <p...@peff.net> writes:

> On Mon, Sep 17, 2012 at 04:49:39PM -0700, Junio C Hamano wrote:
>
>> > However, when it came to creating the series, with comments, I
>> > couldn't see a way of having my comments within my local commits, but
>> > preparing a patch series that would properly include the '---'
>> > separator.
>> 
>> An unofficial trick that works is to write the
>> 
>>     ---
>> 
>>      * This is an additional comment
>> 
>> 
>> yourself when running "git commit".  That will be propagated to the
>> output from format-patch.  You will have another "---" in front of
>> the diffstat, but nobody is hurt by that.
>
> But note that using "format-patch -s" will break; it puts the sign-off
> below the "---".

I think "format-patch -s" is a workflow mistake in the first place.
You should be doing the sign-off the commit when you commit in the
first place.  It is not like "I cannot sign off because I think it
is still iffy" or anything.

But your point still stands; "commit -s" will not see through that
official trick either ;-).

>> But when doing a big series that deserves a cover letter [PATCH 0/n],
>> you will use editor on the output from format-patch anyway, and I
>> find it simpler to do the follow-on comments at that point myself.
>
> Me too (actually, I load it all into mutt and then comment on each as I
> send them out, but it amounts to the same thing, seeing as how my MUA
> just invokes $EDITOR when I edit a mail).
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to