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

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

diff --combined Documentation/config.txt
index 7408bb2d34441dede61718e5d77dd08e26de3731,41dd0f3e9f7881e4a7aa7810ad4d179bc957732a..ea0cd97b04296d29bca853f1e20383ba9f840851
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -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
@@@ -1044,16 -1046,6 +1046,16 @@@ mergetool.keepBackup:
        is set to `false` then this file is not preserved.  Defaults to
        `true` (i.e. keep the backup files).
  
 +mergetool.keepTemporaries::
 +      When invoking a custom merge tool, git uses a set of temporary
 +      files to pass to the tool. If the tool returns an error and this
 +      variable is set to `true`, then these temporary files will be
 +      preserved, otherwise they will be removed after the tool has
 +      exited. Defaults to `false`.
 +
 +mergetool.prompt::
 +      Prompt before each invocation of the merge resolution program.
 +
  pack.window::
        The size of the window used by linkgit:git-pack-objects[1] when no
        window size is given on the command line. Defaults to 10.