Merge branch 'maint-1.7.6' into maint

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0658ffb889320d408f2cad9214e138879059c766..0781341d6b3ad26e99b5db58b1322842564ad107 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1453,7 +1453,8 @@ notes.rewriteRef::
        You may also specify this configuration several times.
 +
 Does not have a default value; you must configure this variable to
-enable note rewriting.
+enable note rewriting.  Set it to `refs/notes/commits` to enable
+rewriting for the default commit notes.
 +
 This setting can be overridden with the `GIT_NOTES_REWRITE_REF`
 environment variable, which must be a colon separated list of refs or