From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Oct 2012 21:54:25 +0000 (-0700)
Subject: Sync with maint
X-Git-Tag: v1.8.0-rc2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8d47dc7f2ddaa70b388fb3f739b9339de826a7fb;p=git.git

Sync with maint

* maint:
  attr: a note about the order of .gitattributes lookup
---

8d47dc7f2ddaa70b388fb3f739b9339de826a7fb