mirror of
https://github.com/git/git.git
synced 2024-10-30 22:07:53 +01:00
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>
This commit is contained in:
parent
da060c67ae
commit
2b3e60c245
1 changed files with 2 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue