Merge branch 'rs/attr'
commitb994ec142f296c7118823495764151c2a6227e1a
authorJunio C Hamano <gitster@pobox.com>
Sat, 14 Jun 2008 18:48:59 +0000 (14 11:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 14 Jun 2008 18:48:59 +0000 (14 11:48 -0700)
tree83d90b6f53b8446e85415e6d645d9a13c97864dd
parentc8c6a2ecb48d717fe2735bf7790226021380d520
parent2d35d556e27cd3e7f3d2eea04a7f0d7ee8513f8e
Merge branch 'rs/attr'

* rs/attr:
  Ignore .gitattributes in bare repositories