Merge branch 'jc/maint-no-reflog-expire-unreach-for-head'
commita660534e06147f8867d6c9b6c41025427a7b5c6c
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 May 2010 11:02:18 +0000 (21 04:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 May 2010 11:02:18 +0000 (21 04:02 -0700)
tree0ba8f85b478e0642ee775df82a94c3640217d756
parent455bda993cceb42921c9ff173da26651f1d66602
parent03cb91b18cc7f9c19c053c97711f592cebddb5f4
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
Documentation/config.txt
Documentation/git-gc.txt
builtin/reflog.c