From: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
Date: Tue, 11 Jul 2017 14:11:08 +0000 (+0530)
Subject: hook: cleanup script
X-Git-Tag: v2.15.0-rc0~211^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b22a3079466b72e8a8b76065d6c28efe7eea4b16?hp=b22a3079466b72e8a8b76065d6c28efe7eea4b16

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>
---