From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 18 Apr 2009 21:46:08 +0000 (-0700)
Subject: Merge branch 'nd/archive-attribute'
X-Git-Tag: v1.6.3-rc1~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5758b25da43c401cad33f3304f78084a0305d21c;p=git.git

Merge branch 'nd/archive-attribute'

* nd/archive-attribute:
  archive test: attributes
  archive: do not read .gitattributes in working directory
  unpack-trees: do not muck with attributes when we are not checking out
  attr: add GIT_ATTR_INDEX "direction"
  archive tests: do not use .gitattributes in working directory
---

5758b25da43c401cad33f3304f78084a0305d21c