aboutsummaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorJosh England <jjengla@sandia.gov>2007-09-11 10:59:03 -0600
committerJunio C Hamano <gitster@pobox.com>2007-09-18 17:40:24 -0700
commit46232915d5ac84fb033ad395bbf161c9645c42c9 (patch)
tree8dbdd23d39b3177fc701c04606d090e470ea7df9 /git-merge-one-file.sh
parent89df580d0a2e97b0c7c072d87e5e815534deed56 (diff)
downloadgit-46232915d5ac84fb033ad395bbf161c9645c42c9.tar.gz
git-46232915d5ac84fb033ad395bbf161c9645c42c9.tar.xz
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 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions