From: Jörg Sommer Date: Mon, 5 May 2008 09:06:49 +0000 (+0200) Subject: post-merge: Add it's not executed if merge failed. X-Git-Tag: v1.5.6-rc0~97 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2b3e60c245684fd68bab36c07fee9888ff24f4b4;p=git.git post-merge: Add it's not executed if merge failed. Signed-off-by: J��rg Sommer Signed-off-by: Junio C Hamano --- diff --git a/Documentation/hooks.txt b/Documentation/hooks.txt index 1283ab4da..d89cc2226 100644 --- a/Documentation/hooks.txt +++ b/Documentation/hooks.txt @@ -137,7 +137,8 @@ post-merge This hook is invoked by `git-merge`, which happens when a `git pull` is done on a local repository. The hook takes a single parameter, a status flag specifying whether or not the merge being done was a squash merge. -This hook cannot affect the outcome of `git-merge`. +This hook cannot affect the outcome of `git-merge` and is not executed, +if the merge failed due to conflicts. This hook can be used in conjunction with a corresponding pre-commit hook to save and restore any form of metadata associated with the working tree