diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-02-25 09:56:58 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-02-25 09:56:58 +0000 |
| commit | d533bdb24ad05b694217e08c5bc39936abc8ffc1 (patch) | |
| tree | bbd1087aaeb838e979294fabdb754bf3d3abc4cb /gitattributes.txt | |
| parent | a50c35cf393bd89ce7538d788769edb0b4af5c8c (diff) | |
| download | git-htmldocs-d533bdb24ad05b694217e08c5bc39936abc8ffc1.tar.gz | |
Autogenerated HTML docs for v1.6.2-rc1-41-g3f74c
Diffstat (limited to 'gitattributes.txt')
| -rw-r--r-- | gitattributes.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gitattributes.txt b/gitattributes.txt index 227934f59..55668e345 100644 --- a/gitattributes.txt +++ b/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 |