From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 May 2010 11:02:18 +0000 (-0700)
Subject: Merge branch 'jc/maint-no-reflog-expire-unreach-for-head'
X-Git-Tag: v1.7.2-rc0~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a660534e06147f8867d6c9b6c41025427a7b5c6c;p=git

Merge branch 'jc/maint-no-reflog-expire-unreach-for-head'

* jc/maint-no-reflog-expire-unreach-for-head:
  reflog --expire-unreachable: special case entries in "HEAD" reflog
  more war on "sleep" in tests
  Document gc.<pattern>.reflogexpire variables

Conflicts:
	Documentation/config.txt
---

a660534e06147f8867d6c9b6c41025427a7b5c6c
diff --cc Documentation/config.txt
index 39140bad4d,4e7dab6ec8..1e402e0878
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -946,13 -885,19 +946,19 @@@ gc.pruneexpire:
  	unreachable objects immediately.
  
  gc.reflogexpire::
+ gc.<pattern>.reflogexpire::
 -	'git-reflog expire' removes reflog entries older than
 +	'git reflog expire' removes reflog entries older than
- 	this time; defaults to 90 days.
+ 	this time; defaults to 90 days.  With "<pattern>" (e.g.
+ 	"refs/stash") in the middle the setting applies only to
+ 	the refs that match the <pattern>.
  
  gc.reflogexpireunreachable::
+ gc.<ref>.reflogexpireunreachable::
 -	'git-reflog expire' removes reflog entries older than
 +	'git reflog expire' removes reflog entries older than
  	this time and are not reachable from the current tip;
- 	defaults to 30 days.
+ 	defaults to 30 days.  With "<pattern>" (e.g. "refs/stash")
+ 	in the middle, the setting applies only to the refs that
+ 	match the <pattern>.
  
  gc.rerereresolved::
  	Records of conflicted merge you resolved earlier are