Merge branch 'maint'

diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index b292e9843aa9da86cd44bd07d3ce35053be32177..dcac8c8e2970c23454f206321292583945ede8c5 100644 (file)
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -61,7 +61,7 @@ automatic consolidation of packs.
 
 --prune=<date>::
        Prune loose objects older than date (default is 2 weeks ago,
-       overrideable by the config variable `gc.pruneExpire`).  This
+       overridable by the config variable `gc.pruneExpire`).  This
        option is on by default.
 
 --no-prune::