diff options
| author | Jörg Sommer <joerg@alea.gnuu.de> | 2008-05-05 11:06:49 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-05 17:30:23 -0700 |
| commit | 2b3e60c245684fd68bab36c07fee9888ff24f4b4 (patch) | |
| tree | 499941d0bce4c88f1b21aa2a1446c369b5338012 /Documentation | |
| parent | da060c67ae5653e5bc59196ff3dbedb7f8faa594 (diff) | |
| download | git-2b3e60c245684fd68bab36c07fee9888ff24f4b4.tar.gz | |
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>
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 |