Merge branch 'maint'

diff --git a/git-merge.sh b/git-merge.sh
index cde09d4d602811b610e0d744f4e8ede6f9fb0a39..6c513dcbdf44036b0207c276e765a87eceb7aa77 100755 (executable)
--- 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 () {