From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Jan 2009 07:42:10 +0000 (-0800)
Subject: Merge branch 'np/no-loosen-prune-expire-now' into maint
X-Git-Tag: v1.6.1.2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8e7d1f6d0300b47770930b82a5fc20fec73727c4?ds=inline;hp=-c

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
---

8e7d1f6d0300b47770930b82a5fc20fec73727c4
diff --combined Documentation/config.txt
index 26551ea6e1,41dd0f3e9f..2ed868c81a
--- a/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