summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorDavid Soria Parra <dsp@php.net>2007-07-30 01:50:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-30 08:27:34 (GMT)
commit5c759f96d020d7021a7e674c8d1e5bebd17dcd2f (patch)
tree2977e3c4b721d39d92bb9b8d661cfd8f783e28a0 /Documentation/gitattributes.txt
parentd7f6bae28142e07e544efdab73260cf9f60ca899 (diff)
downloadgit-5c759f96d020d7021a7e674c8d1e5bebd17dcd2f.zip
git-5c759f96d020d7021a7e674c8d1e5bebd17dcd2f.tar.gz
git-5c759f96d020d7021a7e674c8d1e5bebd17dcd2f.tar.bz2
Documentation/gitattributes.txt: typofix
The file used for per-repository attribute setting is not $GIT_DIR/info/gitattributes, but $GIT_DIR/info/attributes. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitattributes.txt')
-rw-r--r--Documentation/gitattributes.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 810df07..8b90a5b 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/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.