summaryrefslogtreecommitdiffstats
path: root/gitattributes.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-12 12:42:26 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-12 12:42:26 -0700
commit0f1d17c87dc6168bc1321ea1c38a45583f99508d (patch)
treea4dfbd3039ca54494f874a9298d2f4822b2048d8 /gitattributes.txt
parentaf182946f079a91cbb0a29e282aa9c23db0f0456 (diff)
downloadgit-htmldocs-0f1d17c87dc6168bc1321ea1c38a45583f99508d.tar.gz
Autogenerated HTML docs for v2.9.3-599-g2376d
Diffstat (limited to 'gitattributes.txt')
-rw-r--r--gitattributes.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitattributes.txt b/gitattributes.txt
index 34db3e219..807577a59 100644
--- a/gitattributes.txt
+++ b/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::