git: 196cb1deb76c - 2021Q2 - githooks: Rework authorship instructions.

[Mathieu Arnold]

The branch 2021Q2 has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=196cb1deb76c167cc1a853917dec42184b773d8b

commit 196cb1deb76c167cc1a853917dec42184b773d8b
Author:     Mathieu Arnold <mat at FreeBSD.org>
AuthorDate: 2021-04-22 09:47:14 +0000
Commit:     Mathieu Arnold <mat at FreeBSD.org>
CommitDate: 2021-06-04 12:03:44 +0000

    githooks: Rework authorship instructions.
    
    While there, move them upwards so they are not hidden at the far end of
    the template.
    
    (cherry picked from commit 5b7c17856512900d2a13be547869b734a527a57b)
---
 .hooks/prepare-commit-msg | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.hooks/prepare-commit-msg b/.hooks/prepare-commit-msg
index e4e94960988e..12f26c74d0b6 100755
--- a/.hooks/prepare-commit-msg
+++ b/.hooks/prepare-commit-msg
@@ -44,6 +44,9 @@ $(awk '1;/^#$/{exit}' "$1")
 # <then a blank line>
 #                                                         72 columns --|
 #
+# Do not add a Submitted by line.  If someone besides the committer sent in the
+# change, the commit author should be set using \`git commit --author\`.
+#
 # Uncomment and complete these metadata fields, as appropriate:
 #
 # PR:		<If and which Problem Report is related.>
@@ -61,8 +64,7 @@ $(awk '1;/^#$/{exit}' "$1")
 # Differential Revision:	<https://reviews.freebsd.org/D###>
 #
 # "Pull Request" and "Differential Revision" require the *full* GitHub or
-# Phabricator URL.  The commit author should be set appropriately, using
-# \`git commit --author\` if someone besides the committer sent in the change.
+# Phabricator URL.
 $(awk '/^#$/,EOF' "$1")
 EOF