From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 Mar 2011 06:45:49 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.5-rc0~86
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=adfe4e1ff2c296184856bf55636be845f96b55e5;p=git.git

Merge branch 'maint'

* maint:
  Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"
---

adfe4e1ff2c296184856bf55636be845f96b55e5