From: Yannik Tausch <dev@ytausch.de>
Date: Sat, 07 Feb 2026 21:28:00 GMT
Subject: Re: [PATCH v2] merge-file: honor merge.conflictStyle outside of a repository
Message-ID: <75AA7DD7-F8D8-48DC-ADA0-74E56CFF351D@ytausch.de>
In-Reply-To: <xmqqqzqxczeb.fsf@gitster.g>

> Junio C Hamano <gitster@pobox.com> wrote:
> 
> Please do not send patches this way.  Giving responses to review
> comments is very good and strongly encouraged, but stop the response
> message with "a new version of the patch coming!" and have a separate
> message for the patch itself.
> 
> It sometimes is done to interject a sample patch in the middle of a
> discussion, but then the convention is
> 
> ... continuation of an existing discussion ...
> 
> So, how about doing things this way?
> 
> --- >8 ---
> Subject: the title of the patch
> 
> The proposed log message for the commit comes here
> 
> Signed-off-by: you
> ---
> 
> ... notes, diffstat, diff ...
> 
> i.e., use a scissors line to tell the receiving end that the rest of
> the message is a patch message, and override the Subject: with an
> in-body header.  Omit the (From <object-name> Mon Sep 17 2001)
> "magic" line, "From:" and "Date:".  The last two can be taken from
> the e-mail message anyway.

Thanks for your feedback on the patch submission format. Resending v2 as a separate message.