diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-04-25 05:59:25 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-04-25 05:59:25 +0000 |
| commit | 22572e77947993915a2588210bf4581fbe66eda4 (patch) | |
| tree | 04d17a76f3dd0a0c18ff6c72d6fe8b0fd2877ae1 /gitattributes.txt | |
| parent | 47b9acd8e0fd4c6b389fd1be997ba8a8c1a36021 (diff) | |
| download | git-htmldocs-22572e77947993915a2588210bf4581fbe66eda4.tar.gz | |
Autogenerated HTML docs for v1.5.2-rc0-34-gda94
Diffstat (limited to 'gitattributes.txt')
| -rw-r--r-- | gitattributes.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gitattributes.txt b/gitattributes.txt index d2edb9b14..857d55a40 100644 --- a/gitattributes.txt +++ b/gitattributes.txt @@ -49,10 +49,12 @@ Set to a value:: Unspecified:: No glob pattern matches the path, and nothing says if - the path has or does not have the attribute. + 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 -overrides an earlier line. +overrides an earlier line. This overriding is done per +attribute. When deciding what attributes are assigned to a path, git consults `$GIT_DIR/info/attributes` file (which has the highest @@ -215,7 +217,7 @@ String:: merge driver. The built-in 3-way merge driver can be explicitly specified by asking for "text" driver; the built-in "take the current branch" driver can be - requested by "binary". + requested with "binary". Defining a custom merge driver |