diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-09-23 22:51:03 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-09-23 22:51:03 -0700 |
commit | 91d4b2ee816b565d298ee65fcf11d5aecd2d67dc (patch) | |
tree | ecd6d805cbd1b4c5758573ed8b639eba286ab132 /Documentation | |
parent | Merge branch 'js/apply-build-ancestor' (diff) | |
parent | Added example hook script to save/restore permissions/ownership. (diff) | |
download | tgif-91d4b2ee816b565d298ee65fcf11d5aecd2d67dc.tar.xz |
Merge branch 'je/hooks'
* je/hooks:
Added example hook script to save/restore permissions/ownership.
Add post-merge hook, related documentation, and tests.
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/hooks.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/hooks.txt b/Documentation/hooks.txt index c39edc57c4..58b9547596 100644 --- a/Documentation/hooks.txt +++ b/Documentation/hooks.txt @@ -87,6 +87,19 @@ parameter, and is invoked after a commit is made. This hook is meant primarily for notification, and cannot affect the outcome of `git-commit`. +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 can be used in conjunction with a corresponding pre-commit hook to +save and restore any form of metadata associated with the working tree +(eg: permissions/ownership, ACLS, etc). See contrib/hooks/setgitperms.perl +for an example of how to do this. + [[pre-receive]] pre-receive ----------- |