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 /git-merge.sh | |
| parent | 52d5bc9a161f839b78ec06c25736d09703fda802 (diff) | |
| parent | af6fb4c822a5a65c7671d810127171759dff38f6 (diff) | |
| download | git-91d4b2ee816b565d298ee65fcf11d5aecd2d67dc.tar.gz git-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 '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 cde09d4d6..6c513dcbd 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 () { |