From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Sep 2007 05:51:03 +0000 (-0700)
Subject: Merge branch 'je/hooks'
X-Git-Tag: v1.5.4-rc0~421
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=91d4b2ee816b565d298ee65fcf11d5aecd2d67dc;p=git.git

Merge branch 'je/hooks'

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

91d4b2ee816b565d298ee65fcf11d5aecd2d67dc