Merge branch 'kw/write-index-reduce-alloc' into next

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 602c6bef68a6b724d43b65003603ff62a4d21acd..9b42e0ca73429d01f987b2b93c413ab49a98fef4 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1564,11 +1564,13 @@ gc.<pattern>.reflogExpireUnreachable::
 gc.rerereResolved::
        Records of conflicted merge you resolved earlier are
        kept for this many days when 'git rerere gc' is run.
+       You can also use more human-readable "1.month.ago", etc.
        The default is 60 days.  See linkgit:git-rerere[1].
 
 gc.rerereUnresolved::
        Records of conflicted merge you have not resolved are
        kept for this many days when 'git rerere gc' is run.
+       You can also use more human-readable "1.month.ago", etc.
        The default is 15 days.  See linkgit:git-rerere[1].
 
 gitcvs.commitMsgAnnotation::