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

Phillip Wood [off-list ref] writes:

From: Phillip Wood <redacted>

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.