diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-11 16:16:24 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-11 16:16:24 +0900 |
| commit | 0f519aba51645d26431ce716e4136dc47dbba925 (patch) | |
| tree | dd4727d5738fe28264261d7acca113acccf9bfb0 /attr.c | |
| parent | 2cab2886944e4c0c2b8e2d76639bb145743ecc76 (diff) | |
| parent | bb101aaf0c7745c3746d516f2a0ef20f1ee2fa7e (diff) | |
Merge branch 'rd/attr.c-comment-typofix'
In-code comment typofix. * rd/attr.c-comment-typofix: attr.c: ".gitattribute" -> ".gitattributes" (comments)
Diffstat (limited to 'attr.c')
| -rw-r--r-- | attr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/attr.c b/attr.c index fdd110bec5..93dc16b59c 100644 --- a/attr.c +++ b/attr.c @@ -431,14 +431,14 @@ fail_return: * Like info/exclude and .gitignore, the attribute information can * come from many places. * - * (1) .gitattribute file of the same directory; - * (2) .gitattribute file of the parent directory if (1) does not have + * (1) .gitattributes file of the same directory; + * (2) .gitattributes file of the parent directory if (1) does not have * any match; this goes recursively upwards, just like .gitignore. * (3) $GIT_DIR/info/attributes, which overrides both of the above. * * In the same file, later entries override the earlier match, so in the * global list, we would have entries from info/attributes the earliest - * (reading the file from top to bottom), .gitattribute of the root + * (reading the file from top to bottom), .gitattributes of the root * directory (again, reading the file from top to bottom) down to the * current directory, and then scan the list backwards to find the first match. * This is exactly the same as what is_excluded() does in dir.c to deal with @@ -899,7 +899,7 @@ static void prepare_attr_stack(const struct index_state *istate, * set of attribute definitions, followed by the contents * of $(prefix)/etc/gitattributes and a file specified by * core.attributesfile. Then, contents from - * .gitattribute files from directories closer to the + * .gitattributes files from directories closer to the * root to the ones in deeper directories are pushed * to the stack. Finally, at the very top of the stack * we always keep the contents of $GIT_DIR/info/attributes. |