diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/hooks.txt | 3 |
1 files changed, 2 insertions, 1 deletions
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 |