Merge the attributes fix in from maint-1.6.7 branch

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --cc Documentation/config.txt
Simple merge

diff --cc t/t0003-attributes.sh
index dbb2623d930e433111f7e125749f5f1071e9ab3c,19265c77cf0b1df828eea188d5f880cbb7497c63..51f3045ba4bde549b06ea669b1877f0e2db7c401
--- 1/t/t0003-attributes.sh
--- 2/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@@ -157,8 -169,19 +157,18 @@@ test_expect_success 'relative paths' 
        (cd b && attr_check ../a/f f) &&
        (cd b && attr_check ../a/g a/g) &&
        (cd b && attr_check ../a/b/g a/b/g)
 -
  '
  
+ test_expect_success 'prefixes are not confused with leading directories' '
+       attr_check a_plus/g unspecified &&
+       cat >expect <<-\EOF &&
+       a/g: test: a/g
+       a_plus/g: test: unspecified
+       EOF
+       git check-attr test a/g a_plus/g >actual &&
+       test_cmp expect actual
+ '
+ 
  test_expect_success 'core.attributesfile' '
        attr_check global unspecified &&
        git config core.attributesfile "$HOME/global-gitattributes" &&