From 2b3e60c245684fd68bab36c07fee9888ff24f4b4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B6rg=20Sommer?= Date: Mon, 5 May 2008 11:06:49 +0200 Subject: [PATCH] post-merge: Add it's not executed if merge failed. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: J��rg Sommer Signed-off-by: Junio C Hamano --- Documentation/hooks.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/hooks.txt b/Documentation/hooks.txt index 1283ab4daa..d89cc22261 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 -- 2.11.4.GIT