Skip to content

Commit 0f519ab

Browse files
committed
Merge branch 'rd/attr.c-comment-typofix'
In-code comment typofix. * rd/attr.c-comment-typofix: attr.c: ".gitattribute" -> ".gitattributes" (comments)
2 parents 2cab288 + bb101aa commit 0f519ab

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

attr.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -431,14 +431,14 @@ static struct match_attr *parse_attr_line(const char *line, const char *src,
431431
* Like info/exclude and .gitignore, the attribute information can
432432
* come from many places.
433433
*
434-
* (1) .gitattribute file of the same directory;
435-
* (2) .gitattribute file of the parent directory if (1) does not have
434+
* (1) .gitattributes file of the same directory;
435+
* (2) .gitattributes file of the parent directory if (1) does not have
436436
* any match; this goes recursively upwards, just like .gitignore.
437437
* (3) $GIT_DIR/info/attributes, which overrides both of the above.
438438
*
439439
* In the same file, later entries override the earlier match, so in the
440440
* global list, we would have entries from info/attributes the earliest
441-
* (reading the file from top to bottom), .gitattribute of the root
441+
* (reading the file from top to bottom), .gitattributes of the root
442442
* directory (again, reading the file from top to bottom) down to the
443443
* current directory, and then scan the list backwards to find the first match.
444444
* 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,
899899
* set of attribute definitions, followed by the contents
900900
* of $(prefix)/etc/gitattributes and a file specified by
901901
* core.attributesfile. Then, contents from
902-
* .gitattribute files from directories closer to the
902+
* .gitattributes files from directories closer to the
903903
* root to the ones in deeper directories are pushed
904904
* to the stack. Finally, at the very top of the stack
905905
* we always keep the contents of $GIT_DIR/info/attributes.

0 commit comments

Comments
 (0)