Merge branch 'jc/reflog-expire' into maint
commit7be9467204de4680e84c366cb30ff05c1c10edbd
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Aug 2008 01:52:50 +0000 (6 18:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Aug 2008 18:40:22 +0000 (7 11:40 -0700)
treee15224b099bb63a1f6ff11d74364c8447c02e38f
parent1e040c0b0577b3de0006f43daa71bfe7ad7532c0
parent60bce2bb8b3cd5ca56f8156cbca16abee151d817
Merge branch 'jc/reflog-expire' into maint

* jc/reflog-expire:
  Make default expiration period of reflog used for stash infinite
  Per-ref reflog expiry configuration