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 /Documentation/githooks.txt | |
| parent | 8b2efe2a0fd93b8721879f796d848a9ce785647f (diff) | |
| download | git-b22a3079466b72e8a8b76065d6c28efe7eea4b16.tar.gz | |
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 'Documentation/githooks.txt')
| -rw-r--r-- | Documentation/githooks.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index b2514f4d44..43f3555075 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@ -121,9 +121,6 @@ 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. - commit-msg ~~~~~~~~~~ |