gitattributes.txt: Path matching rules are explained in gitignore.txt

The rules how the patterns are matched against path names are the same
for .gitattribute and .gitignore files.

This also replace the notion "glob pattern" by "pattern" because
gitignore.txt talks about "glob" only in some contexts where the pattern
is mentioned.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Sixt 2009-02-25 08:54:42 +01:00 коммит произвёл Junio C Hamano
Родитель a9d98a148d
Коммит 3f74c8e8d8
1 изменённых файлов: 7 добавлений и 6 удалений

Просмотреть файл

@ -18,10 +18,10 @@ A `gitattributes` file is a simple text file that gives
Each line in `gitattributes` file is of form: Each line in `gitattributes` file is of form:
glob attr1 attr2 ... pattern attr1 attr2 ...
That is, a glob pattern followed by an attributes list, That is, a pattern followed by an attributes list,
separated by whitespaces. When the glob pattern matches the separated by whitespaces. When the pattern matches the
path in question, the attributes listed on the line are given to path in question, the attributes listed on the line are given to
the path. the path.
@ -48,13 +48,14 @@ Set to a value::
Unspecified:: Unspecified::
No glob pattern matches the path, and nothing says if No pattern matches the path, and nothing says if
the path has or does not have the attribute, the the path has or does not have the attribute, the
attribute for the path is said to be Unspecified. attribute for the path is said to be Unspecified.
When more than one glob pattern matches the path, a later line When more than one pattern matches the path, a later line
overrides an earlier line. This overriding is done per overrides an earlier line. This overriding is done per
attribute. attribute. The rules how the pattern matches paths are the
same as in `.gitignore` files; see linkgit:gitignore[5].
When deciding what attributes are assigned to a path, git When deciding what attributes are assigned to a path, git
consults `$GIT_DIR/info/attributes` file (which has the highest consults `$GIT_DIR/info/attributes` file (which has the highest