{"thread":{"id":"13384","subject":"[PATCH] post-merge: Add it's not executed if merge failed.","startedAt":"2008-05-05T09:06:49Z","lastAt":"2008-05-05T09:06:49Z","messageCount":1,"participants":["Jörg Sommer"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"76120","messageId":"1209978409-19396-1-git-send-email-joerg@alea.gnuu.de","threadId":"13384","inReplyTo":null,"subject":"[PATCH] post-merge: Add it's not executed if merge failed.","fromName":"Jörg Sommer","fromEmail":"joerg@alea.gnuu.de","sentAt":"2008-05-05T09:06:49Z","receivedAt":"2008-05-05T09:06:49Z","isPatch":true,"sender":{"key":"joerg@alea.gnuu.de","avatar":null},"body":"\nSigned-off-by: Jörg Sommer <joerg@alea.gnuu.de>\n---\n Documentation/hooks.txt |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/hooks.txt b/Documentation/hooks.txt\nindex 44fbe58..43764e3 100644\n--- a/Documentation/hooks.txt\n+++ b/Documentation/hooks.txt\n@@ -136,7 +136,8 @@ post-merge\n This hook is invoked by `git-merge`, which happens when a `git pull`\n is done on a local repository.  The hook takes a single parameter, a status\n flag specifying whether or not the merge being done was a squash merge.\n-This hook cannot affect the outcome of `git-merge`.\n+This hook cannot affect the outcome of `git-merge` and is not executed,\n+if the merge failed due to conflicts.\n \n This hook can be used in conjunction with a corresponding pre-commit hook to\n save and restore any form of metadata associated with the working tree\n-- \n1.5.5.1\n"}]}