attr.c: mark where #if DEBUG ends more clearly

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 4a991f35828dc8ed6037cf931bc1f5b140bef22d..506431267ed0ef15bce2570d3f1bf69e7268e8f0 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -783,10 +783,11 @@ core.sparseCheckout::
        linkgit:git-read-tree[1] for more information.
 
 core.abbrev::
-       Set the length object names are abbreviated to.  If unspecified,
-       many commands abbreviate to 7 hexdigits, which may not be enough
-       for abbreviated object names to stay unique for sufficiently long
-       time.
+       Set the length object names are abbreviated to.  If
+       unspecified or set to "auto", an appropriate value is
+       computed based on the approximate number of packed objects
+       in your repository, which hopefully is enough for
+       abbreviated object names to stay unique for some time.
 
 add.ignoreErrors::
 add.ignore-errors (deprecated)::
@@ -3030,6 +3031,11 @@ uploadpack.allowReachableSHA1InWant::
        section of the linkgit:gitnamespaces[7] man page; it's best to
        keep private data in a separate repository.
 
+uploadpack.allowAnySHA1InWant::
+       Allow `upload-pack` to accept a fetch request that asks for any
+       object at all.
+       Defaults to `false`.
+
 uploadpack.keepAlive::
        When `upload-pack` has started `pack-objects`, there may be a
        quiet period while `pack-objects` prepares the pack. Normally