Re: [PATCH] cvsimport: setup indexes correctly for ancestors and incremental imports

From: Junio C Hamano <junkio@cox.net>
Date: Jun 25, 2006, 09:27 UTC
Message-ID: <7v4py9y48t.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20060625085359.GC21864@pasky.or.cz>

Petr Baudis <pasky@suse.cz> writes:

Show 8 quoted lines

> Dear diary, on Sun, Jun 25, 2006 at 05:10:36AM CEST, I got a letter
> where Junio C Hamano <junkio@cox.net> said that...
>> Please please please do not use --- between the cover letter and
>> commit message body if you choose to do the cover letter first.
>
> Oops, I suspect that I'm a huge offender in this regard in that case.
> Can I format my patch mails so that they look like natural replies _and_
> you can still apply them easily?

It's not a big deal.

I do it with scissors mark "-- >8 --" because I can use "git-am" while still in GNUS with '|' (gnus-summary-pipe-output) on the message, and immediately after that I can amend the commit with "git-commit --amend" to remove everything up to the scissors mark.

If you have --- then I have to save the message in a separate file with 'C-o' (gnus-summary-save-article-mail), open the file and remove up to that first --- in the editor, and then run git-am on the file.

Only when the cover letter is short, I'd prefer Linus style, which places cover letter material after the --- and the diffstat, although that makes the message like top-posting.