diff options
| author |  Kaartic Sivaraam <kaarticsivaraam91196@gmail.com> | 2017-07-11 19:41:08 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-07-12 13:20:40 -0700 |
| commit | b22a3079466b72e8a8b76065d6c28efe7eea4b16 (patch) | |
| tree | fc3c4762eb106d903ac01ed6f5e21d76533b56e8 /templates/hooks--applypatch-msg.sample | |
| parent | Fifteenth batch for 2.14 (diff) | |
| download | tgif-b22a3079466b72e8a8b76065d6c28efe7eea4b16.tar.xz | |
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>
Diffstat (limited to 'templates/hooks--applypatch-msg.sample')
0 files changed, 0 insertions, 0 deletions