merge-recursive: Avoid doubly merging rename/add conflict contents

diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index a9e0882e9b81fe15780785dc85e3fb2782480ae1..315f07ef1c6997c98c4e446af507c3e1e4566218 100644 (file)
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -137,6 +137,13 @@ If you are expecting some objects to be collected and they aren't, check
 all of those locations and decide whether it makes sense in your case to
 remove those references.
 
+HOOKS
+-----
+
+The 'git gc --auto' command will run the 'pre-auto-gc' hook.  See
+linkgit:githooks[5] for more information.
+
+
 SEE ALSO
 --------
 linkgit:git-prune[1]