Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation/gitattributes.txt: typofix
author
David Soria Parra
<dsp@php.net>
Mon, 30 Jul 2007 01:50:24 +0000
(22:50 -0300)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 30 Jul 2007 08:27:34 +0000
(
01:27
-0700)
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>
Documentation/gitattributes.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
d7f6bae
)
diff --git
a/Documentation/gitattributes.txt
b/Documentation/gitattributes.txt
index 810df07217b1af6d38ea1c9661af17983d30642f..8b90a5b98074e5aab851b7689d83b25a4e38e373 100644
(file)
--- 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/
git
attributes`. 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.