Merge branch 'np/no-loosen-prune-expire-now' into maint

* np/no-loosen-prune-expire-now:
objects to be pruned immediately don't have to be loosened

diff --combined Documentation/config.txt
index 26551ea6e1bba817bc272243368e082fecaca2f1,41dd0f3e9f7881e4a7aa7810ad4d179bc957732a..2ed868c81a09af9176bd805f819c0b312556891a
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -635,7 -635,7 +635,7 @@@ diff.renames:
        will enable basic rename detection.  If set to "copies" or
        "copy", it will detect copies, as well.
  
 -diff.suppress-blank-empty::
 +diff.suppressBlankEmpty::
        A boolean to inhibit the standard behavior of printing a space
        before each empty output line. Defaults to false.
  
@@@ -702,7 -702,9 +702,9 @@@ gc.packrefs:
  
  gc.pruneexpire::
        When 'git-gc' is run, it will call 'prune --expire 2.weeks.ago'.
-       Override the grace period with this config variable.
+       Override the grace period with this config variable.  The value
+       "now" may be used to disable this  grace period and always prune
+       unreachable objects immediately.
  
  gc.reflogexpire::
        'git-reflog expire' removes reflog entries older than