From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 Feb 2026 17:41:25 GMT
Subject: Re: [PATCH v2 0/2] commit-msg.sample: reject messages that would confuse "git am"
Message-ID: <xmqqjywgmth6.fsf@gitster.g>
In-Reply-To: <cover.1770993281.git.phillip.wood@dunelm.org.uk>

Phillip Wood <phillip.wood123@gmail.com> writes:

> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> This series adds a check to the sample commit-msg hook to reject commit
> messages where the body of the message contains lines starting with
> "diff -" and "Index: ". Such lines confuse "git am".
>
> Changes since V1:
>
>  - Allow subjects to start with "diff -" as they end up in an email
>    header and so do not confuse "git am"
>
>  - Allow "---" lines as they are useful when preparing patches.

I see some mention of scissors line that is also new.