Merge branch 'rh/merge-options-doc-fix'

diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index b370b025b89ffad0664171a03527b9a775172dee..2402ed68280ded314c340e394da64b3372038113 100644 (file)
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -62,8 +62,9 @@ automatic consolidation of packs.
 
 --prune=<date>::
        Prune loose objects older than date (default is 2 weeks ago,
-       overridable by the config variable `gc.pruneExpire`).  This
-       option is on by default.
+       overridable by the config variable `gc.pruneExpire`).
+       --prune=all prunes loose objects regardless of their age.
+       --prune is on by default.
 
 --no-prune::
        Do not prune any loose objects.