Merge branch 'je/hooks'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2007 05:51:03 +0000 (22:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2007 05:51:03 +0000 (22:51 -0700)
commit91d4b2ee816b565d298ee65fcf11d5aecd2d67dc
treeecd6d805cbd1b4c5758573ed8b639eba286ab132
parent52d5bc9a161f839b78ec06c25736d09703fda802
parentaf6fb4c822a5a65c7671d810127171759dff38f6
Merge branch 'je/hooks'

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