summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Robert P. J. Day <rpjday@crashcourse.ca>2019-03-06 04:14:44 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-03-07 09:34:47 +0900
commitbb101aaf0c7745c3746d516f2a0ef20f1ee2fa7e (patch)
treeed5d6a8b8181a2c2c68713de5027fe47ad5a1ed3
parentGit 2.20.1 (diff)
downloadtgif-bb101aaf0c7745c3746d516f2a0ef20f1ee2fa7e.tar.xz
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>
-rw-r--r--attr.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/attr.c b/attr.c
index eaece6658d..9aa29ef6ef 100644
--- a/attr.c
+++ b/attr.c
@@ -432,14 +432,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
@@ -900,7 +900,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.