attr.c: ".gitattribute" -> ".gitattributes" (comments)
Correct misspelled ".gitattribute" in comments only, so no functional change. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Robert P. J. Day committed
Mar 6, 2019 at 04:14 UTC
bb101aaf0c7745c3746d516f2a0ef20f1ee2fa7e
1 file changed
+4
-4
attr.c
+4
-4
@@ -432,14 +432,14 @@ fail_return:
432
* Like info/exclude and .gitignore, the attribute information can
433
* come from many places.
434
*
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
437
* any match; this goes recursively upwards, just like .gitignore.
438
* (3) $GIT_DIR/info/attributes, which overrides both of the above.
439
*
440
* In the same file, later entries override the earlier match, so in the
441
* 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
443
* directory (again, reading the file from top to bottom) down to the
444
* current directory, and then scan the list backwards to find the first match.
445
* 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,
900
* set of attribute definitions, followed by the contents
901
* of $(prefix)/etc/gitattributes and a file specified by
902
* core.attributesfile. Then, contents from
903
- * .gitattribute files from directories closer to the
903
+ * .gitattributes files from directories closer to the
904
* root to the ones in deeper directories are pushed
905
* to the stack. Finally, at the very top of the stack
906
* we always keep the contents of $GIT_DIR/info/attributes.