diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2009-02-25 08:54:42 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-25 00:49:54 -0800 |
| commit | 3f74c8e8d8721d093655d7bb00ead078d8324100 (patch) | |
| tree | de8ec79a019d2fd6bf6ed020d047e1b9e64c1a40 | |
| parent | a9d98a148dd5ed14d9e74a1dfc5ec1ca3632f4f0 (diff) | |
| download | git-3f74c8e8d8721d093655d7bb00ead078d8324100.tar.gz git-3f74c8e8d8721d093655d7bb00ead078d8324100.tar.xz | |
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>
| -rw-r--r-- | Documentation/gitattributes.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 227934f59..55668e345 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -18,10 +18,10 @@ A `gitattributes` file is a simple text file that gives Each line in `gitattributes` file is of form: - glob attr1 attr2 ... + pattern attr1 attr2 ... -That is, a glob pattern followed by an attributes list, -separated by whitespaces. When the glob pattern matches the +That is, a pattern followed by an attributes list, +separated by whitespaces. When the pattern matches the path in question, the attributes listed on the line are given to the path. @@ -48,13 +48,14 @@ Set to a value:: 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 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 -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 consults `$GIT_DIR/info/attributes` file (which has the highest |