Merge branch 'jc/maint-no-reflog-expire-unreach-for-head' into next
commitd23a180c0a875e23053040618046930490f79c72
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 May 2010 00:50:17 +0000 (4 17:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 May 2010 00:50:17 +0000 (4 17:50 -0700)
treeda5385a00ffd997f0dc05aaa737143129f4dc3fd
parent8d1591fc450ed7e488cf35c6b860c47174763227
parent03cb91b18cc7f9c19c053c97711f592cebddb5f4
Merge branch 'jc/maint-no-reflog-expire-unreach-for-head' into next

* 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
Documentation/config.txt
Documentation/git-gc.txt
builtin/reflog.c