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

diff --cc Documentation/config.txt
index 39140bad4d3b3c50a9cf090545299c81001db329,4e7dab6ec8e4a078edc3176e329613432959cfb2..1e402e0878868504a9178611d985561546779610
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -946,13 -885,19 +946,19 @@@ gc.pruneexpire:
        unreachable objects immediately.
  
  gc.reflogexpire::
 -      'git-reflog expire' removes reflog entries older than
+ gc.<pattern>.reflogexpire::
-       this time; defaults to 90 days.
 +      'git reflog expire' removes reflog entries older than
+       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::
 -      'git-reflog expire' removes reflog entries older than
+ gc.<ref>.reflogexpireunreachable::
 +      '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

diff --cc Documentation/git-gc.txt
Simple merge

diff --cc builtin/reflog.c
Simple merge