Code

Add post-merge hook, related documentation, and tests.
authorJosh England <jjengla@sandia.gov>
Tue, 11 Sep 2007 16:59:03 +0000 (10:59 -0600)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Sep 2007 00:40:24 +0000 (17:40 -0700)
commit46232915d5ac84fb033ad395bbf161c9645c42c9
tree8dbdd23d39b3177fc701c04606d090e470ea7df9
parent89df580d0a2e97b0c7c072d87e5e815534deed56
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>
Documentation/hooks.txt
git-merge.sh
t/t5402-post-merge-hook.sh [new file with mode: 0755]