Merge branch 'ja/directory-attrs'
commitf7b3652bc9b0a2b692e3ebc03e4e72398bc6cfbd
authorJunio C Hamano <gitster@pobox.com>
Sun, 6 Jan 2013 07:41:46 +0000 (5 23:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 6 Jan 2013 07:41:46 +0000 (5 23:41 -0800)
tree761ae813e324ac6f4b619d4994f20521f3d8138a
parent3a3100a889cab5d3a1a590258304dacd188a17f6
parent94bc671a1f2e8610de475c2494d2763355a99f65
Merge branch 'ja/directory-attrs'

The attribute mechanism didn't allow limiting attributes to be
applied to only a single directory itself with "path/" like the
exclude mechanism does.

* ja/directory-attrs:
  Add directory pattern matching to attributes