diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-07-30 09:07:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-07-30 09:07:17 +0000 |
| commit | bdeff822de152c9855766ea84cfd2534ebc19f52 (patch) | |
| tree | 9a5ecf30791c00cd28cded8b040f968db93e3686 /gitattributes.txt | |
| parent | b968dbbd6a939fc1282a7837026e131ed921e122 (diff) | |
| download | git-htmldocs-bdeff822de152c9855766ea84cfd2534ebc19f52.tar.gz | |
Autogenerated HTML docs for v1.5.3-rc3-91-g5c75
Diffstat (limited to 'gitattributes.txt')
| -rw-r--r-- | gitattributes.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gitattributes.txt b/gitattributes.txt index 810df0721..8b90a5b98 100644 --- a/gitattributes.txt +++ b/gitattributes.txt @@ -405,7 +405,7 @@ the attributes given to path `t/abc` are computed as follows: and `bar` attributes should be given to this path, so it leaves `foo` and `bar` unset. Attribute `baz` is set. -3. Finally it examines `$GIT_DIR/info/gitattributes`. This file +3. Finally it examines `$GIT_DIR/info/attributes`. This file is used to override the in-tree settings. The first line is a match, and `foo` is set, `bar` is reverted to unspecified state, and `baz` is unset. |