Merge branch 'rs/archive-excluded-directory' into maint

diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index 852b72c679e4193d5fed46b926a6456ef49cc4b1..571b5a7e3c9dbc11aafc194b6e08dbbed5b2f7d3 100644 (file)
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -127,7 +127,7 @@ the documentation for the --window' option in linkgit:git-repack[1] for
 more details.  This defaults to 250.
 
 Similarly, the optional configuration variable `gc.aggressiveDepth`
-controls --depth option in linkgit:git-repack[1]. This defaults to 250.
+controls --depth option in linkgit:git-repack[1]. This defaults to 50.
 
 The optional configuration variable `gc.pruneExpire` controls how old
 the unreferenced loose objects have to be before they are pruned.  The