hook: cleanup script
commitb22a3079466b72e8a8b76065d6c28efe7eea4b16
authorKaartic Sivaraam <kaarticsivaraam91196@gmail.com>
Tue, 11 Jul 2017 14:11:08 +0000 (11 19:41 +0530)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Jul 2017 20:20:40 +0000 (12 13:20 -0700)
treefc3c4762eb106d903ac01ed6f5e21d76533b56e8
parent8b2efe2a0fd93b8721879f796d848a9ce785647f
hook: cleanup script

Prepare the 'preare-commit-msg' sample script for
upcoming changes. Preparation includes removal of
an example that has outlived it's purpose. The example
is the one that comments the "Conflicts:" part of a
merge commit message. It isn't relevant anymore as
it's done by default since 261f315b ("merge & sequencer:
turn "Conflicts:" hint into a comment", 2014-08-28).

Further update the relevant comments from the sample script
and update the documentation.

Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/githooks.txt
templates/hooks--prepare-commit-msg.sample