Skip to content

Commit bb101aa

Browse files
robertpjdaygitster
authored andcommitted
attr.c: ".gitattribute" -> ".gitattributes" (comments)
Correct misspelled ".gitattribute" in comments only, so no functional change. Signed-off-by: Robert P. J. Day <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0d0ac38 commit bb101aa

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
@@ -432,14 +432,14 @@ static struct match_attr *parse_attr_line(const char *line, const char *src,
432432
* Like info/exclude and .gitignore, the attribute information can
433433
* come from many places.
434434
*
435-
* (1) .gitattribute file of the same directory;
436-
* (2) .gitattribute file of the parent directory if (1) does not have
435+
* (1) .gitattributes file of the same directory;
436+
* (2) .gitattributes file of the parent directory if (1) does not have
437437
* any match; this goes recursively upwards, just like .gitignore.
438438
* (3) $GIT_DIR/info/attributes, which overrides both of the above.
439439
*
440440
* In the same file, later entries override the earlier match, so in the
441441
* global list, we would have entries from info/attributes the earliest
442-
* (reading the file from top to bottom), .gitattribute of the root
442+
* (reading the file from top to bottom), .gitattributes of the root
443443
* directory (again, reading the file from top to bottom) down to the
444444
* current directory, and then scan the list backwards to find the first match.
445445
* This is exactly the same as what is_excluded() does in dir.c to deal with
@@ -900,7 +900,7 @@ static void prepare_attr_stack(const struct index_state *istate,
900900
* set of attribute definitions, followed by the contents
901901
* of $(prefix)/etc/gitattributes and a file specified by
902902
* core.attributesfile. Then, contents from
903-
* .gitattribute files from directories closer to the
903+
* .gitattributes files from directories closer to the
904904
* root to the ones in deeper directories are pushed
905905
* to the stack. Finally, at the very top of the stack
906906
* we always keep the contents of $GIT_DIR/info/attributes.

0 commit comments

Comments
 (0)