Merge branch 'maint'

diff --git a/templates/hooks--commit-msg b/templates/hooks--commit-msg
index 0b906caa98f3d4deced75d196d969d7216d31961..c5cdb9d7eeebab7edf048e77eb92437de24751bf 100644 (file)
--- a/templates/hooks--commit-msg
+++ b/templates/hooks--commit-msg
@@ -8,6 +8,10 @@
 #
 # To enable this hook, make this file executable.
 
+# Uncomment the below to add a Signed-off-by line to the message.
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
 # This example catches duplicate Signed-off-by lines.
 
 test "" = "$(grep '^Signed-off-by: ' "$1" |
@@ -15,4 +19,3 @@ test "" = "$(grep '^Signed-off-by: ' "$1" |
        echo >&2 Duplicate Signed-off-by lines.
        exit 1
 }
-