Merge branch 'je/hooks'

* je/hooks:
Added example hook script to save/restore permissions/ownership.
Add post-merge hook, related documentation, and tests.

diff --combined git-merge.sh
index cde09d4d602811b610e0d744f4e8ede6f9fb0a39,66e48b3b18061e083021d8a5c15d252fbb1988ff..6c513dcbdf44036b0207c276e765a87eceb7aa77
--- 1/git-merge.sh
--- 2/git-merge.sh
+++ b/git-merge.sh
@@@ -97,6 -97,19 +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 () {
@@@ -122,7 -135,7 +135,7 @@@
  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|\