![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 24 Sep 2007 05:51:03 +0000 (22:51 -0700) | ||
| committer | Junio 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.
Added example hook script to save/restore permissions/ownership.
Add post-merge hook, related documentation, and tests.
| 1 | 2 | |||
|---|---|---|---|---|
| git-merge.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc git-merge.sh
Simple merge