diff options
| author | Josh England <jjengla@sandia.gov> | 2007-09-11 20:59:03 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-19 04:40:24 +0400 |
| commit | 46232915d5ac84fb033ad395bbf161c9645c42c9 (patch) | |
| tree | 8dbdd23d39b3177fc701c04606d090e470ea7df9 /git-merge.sh | |
| parent | 89df580d0a2e97b0c7c072d87e5e815534deed56 (diff) | |
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.sh')
| -rwxr-xr-x | git-merge.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/git-merge.sh b/git-merge.sh index 3a01db0d75..66e48b3b18 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -97,6 +97,19 @@ finish () { fi ;; esac + + # Run a post-merge hook + if test -x "$GIT_DIR"/hooks/post-merge + then + case "$squash" in + t) + "$GIT_DIR"/hooks/post-merge 1 + ;; + '') + "$GIT_DIR"/hooks/post-merge 0 + ;; + esac + fi } merge_name () { |