Merge branch 'ja/directory-attrs' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 00:46:46 +0000 (16:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 00:46:46 +0000 (16:46 -0800)
commit22fd1c84100b4c26328a8ad0c044cce2aaf8e130
treeaf4ccfc04521d42c26bb64783ab7cd5b7b70c173
parentc039f35b8af8c0e7a29f8d9403c020497ed40f67
parent94bc671a1f2e8610de475c2494d2763355a99f65
Merge branch 'ja/directory-attrs' into maint

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