summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-08-11 13:26:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-11 13:26:56 -0700
commit127f98f42b0b72d2d23c97e7d783d369b6e33fa0 (patch)
treebb22b4381ebc8d52fa4e6abde1f17d0b342dc82f /Documentation
parentMerge branch 'bw/object-id' (diff)
parenthook: add a simple first example (diff)
downloadtgif-127f98f42b0b72d2d23c97e7d783d369b6e33fa0.tar.xz
Merge branch 'ks/prepare-commit-msg-sample'
Remove an example that is now obsolete from a sample hook, and improve an old example in it that added a sign-off manually to use the interpret-trailers command. * ks/prepare-commit-msg-sample: hook: add a simple first example hook: add sign-off using "interpret-trailers" hook: name the positional variables hook: cleanup script
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/githooks.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index b2514f4d44..623ed1a138 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -121,8 +121,8 @@ it is not suppressed by the `--no-verify` option. A non-zero exit
means a failure of the hook and aborts the commit. It should not
be used as replacement for pre-commit hook.
-The sample `prepare-commit-msg` hook that comes with Git comments
-out the `Conflicts:` part of a merge's commit message.
+The sample `prepare-commit-msg` hook that comes with Git removes the
+help message found in the commented portion of the commit template.
commit-msg
~~~~~~~~~~