From: Michael J Gruber Date: Thu, 06 Sep 2012 14:25:55 GMT Subject: [PATCHv2 1/4] merge: document prepare-commit-msg hook usage Message-ID: In-Reply-To: <50487F8A.4050803@alum.mit.edu> Signed-off-by: Michael J Gruber --- Documentation/git-merge.txt | 5 +++++ Documentation/githooks.txt | 2 ++ 2 files changed, 7 insertions(+) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 20f9228..b3ba8a8 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -308,6 +308,11 @@ branch..mergeoptions:: supported options are the same as those of 'git merge', but option values containing whitespace characters are currently not supported. +HOOKS +----- +This command can run the `prepare-commit-msg` hook. +See linkgit:githooks[5] for more information. + SEE ALSO -------- linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index b9003fe..b32134c 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@ -108,6 +108,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. +This hook is also called by 'git merge' when it creates a new commit. + The sample `prepare-commit-msg` hook that comes with git comments out the `Conflicts:` part of a merge's commit message. -- 1.7.12.406.gafd3f81