summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-12 09:47:37 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-12 09:47:37 -0700
commite6b8f80653063cd41903c599ec9ca83be3d3afa5 (patch)
tree52d1e93fe3edc581275f92f98981c3103471af58 /Documentation/gitattributes.txt
parent2c44b7a53bf49430f231a71668d2a1c4ea9f5591 (diff)
parent2e3a16b279a9df2e498187871c67e623e12bc8a4 (diff)
downloadgit-e6b8f80653063cd41903c599ec9ca83be3d3afa5.tar.gz
Merge branch 'vs/typofix'
* vs/typofix: Spelling fixes
Diffstat (limited to 'Documentation/gitattributes.txt')
-rw-r--r--Documentation/gitattributes.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 34db3e219b..807577a59f 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -133,7 +133,7 @@ Set to string value "auto"::
When `text` is set to "auto", the path is marked for automatic
end-of-line conversion. If Git decides that the content is
text, its line endings are converted to LF on checkin.
- When the file has been commited with CRLF, no conversion is done.
+ When the file has been committed with CRLF, no conversion is done.
Unspecified::