Make merge-recursive honor diff.renamelimit

diff --git a/Documentation/hooks.txt b/Documentation/hooks.txt
index 50535a7983297e8ad1f3202bda13514dfc6b9e9d..58b954759610ca272b72a05db0cd14e2868ff301 100644 (file)
--- a/Documentation/hooks.txt
+++ b/Documentation/hooks.txt
@@ -97,7 +97,8 @@ This hook cannot affect the outcome of `git-merge`.
 
 This hook can be used in conjunction with a corresponding pre-commit hook to
 save and restore any form of metadata associated with the working tree
-(eg: permissions/ownership, ACLS, etc).
+(eg: permissions/ownership, ACLS, etc).  See contrib/hooks/setgitperms.perl
+for an example of how to do this.
 
 [[pre-receive]]
 pre-receive