Merge branch 'as/maint-expire'
commit81ca93f1ce1f5e1ab0e88413914f5e9d23816e11
authorJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 20:47:17 +0000 (7 12:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 20:47:17 +0000 (7 12:47 -0800)
tree6d94d28ff3c699d5ba510f991e817214e2dca524
parent3fea3139c252298f6d79a405f889f05859b9c47d
parent4a9f439415eda734914c7328a2326ee9590246ee
Merge branch 'as/maint-expire'

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