Merge branch 'as/maint-expire' into maint
commit030bc0aa8b012170b69f40f95b152a1080447301
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Mar 2010 08:36:01 +0000 (8 00:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Mar 2010 08:36:01 +0000 (8 00:36 -0800)
tree0f77de6b03c86309a6157fc778fcc783910e1423
parent193c7aaf5f17116f5e3e2449326fd9f6cdfc062d
parent4a9f439415eda734914c7328a2326ee9590246ee
Merge branch 'as/maint-expire' into maint

* as/maint-expire:
  reflog: honor gc.reflogexpire=never
  prune: honor --expire=never