From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Jan 2009 07:09:24 +0000 (-0800)
Subject: Merge branch 'np/no-loosen-prune-expire-now'
X-Git-Tag: v1.6.2-rc0~166
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/08541563f468b41f08fe91854fc6530f075542d8?ds=inline;hp=-c

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

08541563f468b41f08fe91854fc6530f075542d8
diff --combined Documentation/config.txt
index 7408bb2d34,41dd0f3e9f..ea0cd97b04
--- a/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.