Subject: Re: [PATCH v2 0/2] commit-msg.sample: reject messages that would confuse "git am"

From: Junio C Hamano <[email-masked]>
Date: Fri, 13 Feb 2026 09:41:25 -0800

Phillip Wood <[email-masked]> writes:

> From: Phillip Wood <[email-masked]>
>
> 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.