From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 7 Mar 2010 20:47:17 +0000 (-0800)
Subject: Merge branch 'as/maint-expire'
X-Git-Tag: v1.7.1-rc0~80
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=81ca93f1ce1f5e1ab0e88413914f5e9d23816e11;p=git.git

Merge branch 'as/maint-expire'

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

81ca93f1ce1f5e1ab0e88413914f5e9d23816e11