post-merge: Add it's not executed if merge failed.
Signed-off-by: J��rg Sommer <joerg@alea.gnuu.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jörg Sommer committed
May 5, 2008 at 11:06 UTC
2b3e60c245684fd68bab36c07fee9888ff24f4b4
1 file changed
+2
-1
Documentation/hooks.txt
+2
-1
@@ -137,7 +137,8 @@ post-merge
137
This hook is invoked by `git-merge`, which happens when a `git pull`
138
is done on a local repository. The hook takes a single parameter, a status
139
flag specifying whether or not the merge being done was a squash merge.
140
-This hook cannot affect the outcome of `git-merge`.
140
+This hook cannot affect the outcome of `git-merge` and is not executed,
141
+if the merge failed due to conflicts.
142
143
This hook can be used in conjunction with a corresponding pre-commit hook to
144
save and restore any form of metadata associated with the working tree