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)
* je/hooks:
Added example hook script to save/restore permissions/ownership.
Add post-merge hook, related documentation, and tests.

1  2 
git-merge.sh
diff --cc git-merge.sh
Simple merge