summaryrefslogtreecommitdiff
path: root/Documentation/hooks.txt
diff options
context:
space:
mode:
authorJosh England <jjengla@sandia.gov>2007-09-11 16:59:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-19 00:40:24 (GMT)
commit46232915d5ac84fb033ad395bbf161c9645c42c9 (patch)
tree8dbdd23d39b3177fc701c04606d090e470ea7df9 /Documentation/hooks.txt
parent89df580d0a2e97b0c7c072d87e5e815534deed56 (diff)
downloadgit-46232915d5ac84fb033ad395bbf161c9645c42c9.zip
git-46232915d5ac84fb033ad395bbf161c9645c42c9.tar.gz
git-46232915d5ac84fb033ad395bbf161c9645c42c9.tar.bz2
Add post-merge hook, related documentation, and tests.
The post-merge hook enables one to hook in for `git pull` operations in order to check and/or change attributes of a work tree from the hook. As an example, it can be used in combination with a pre-commit hook to save/restore file ownership and permissions data (or file ACLs) within the repository and transparently update the working tree after a `git pull` operation. Signed-off-by: Josh England <jjengla@sandia.gov> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/hooks.txt')
-rw-r--r--Documentation/hooks.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/hooks.txt b/Documentation/hooks.txt
index c39edc5..50535a7 100644
--- a/Documentation/hooks.txt
+++ b/Documentation/hooks.txt
@@ -87,6 +87,18 @@ 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).
+
[[pre-receive]]
pre-receive
-----------