Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de>
---
Documentation/hooks.txt | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Show changes to Documentation/hooks.txt +2 −1
diff --git a/Documentation/hooks.txt b/Documentation/hooks.txt
index 44fbe58..43764e3 100644
--- a/Documentation/hooks.txt
+++ b/Documentation/hooks.txt
@@ -136,7 +136,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
--
1.5.5.1