diff options
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index 697bec24fa..bf18f582da 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -98,6 +98,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 () { @@ -123,7 +136,7 @@ merge_name () { case "$#" in 0) usage ;; esac have_message= -while case "$#" in 0) break ;; esac +while test $# != 0 do case "$1" in -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\ |