summaryrefslogtreecommitdiff
path: root/Documentation/git-hash-object.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-20 19:53:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-20 19:53:08 (GMT)
commit7d61b31b67a470c7008a989901d3efa1e6533dbe (patch)
tree93e5afaee66b77ced3d04a7c90f96cb41e8367d3 /Documentation/git-hash-object.txt
parent09c6a8e66cfe51400e6e7d5086266195c7ef62bf (diff)
parent6b677a28ffded042da18e3aefbb01d28e4a1b11b (diff)
downloadgit-7d61b31b67a470c7008a989901d3efa1e6533dbe.zip
git-7d61b31b67a470c7008a989901d3efa1e6533dbe.tar.gz
git-7d61b31b67a470c7008a989901d3efa1e6533dbe.tar.bz2
Merge branch 'vs/doc-spell' into maint
* vs/doc-spell: Documentation: spelling fixes
Diffstat (limited to 'Documentation/git-hash-object.txt')
-rw-r--r--Documentation/git-hash-object.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
index 6904739..51edeec 100644
--- a/Documentation/git-hash-object.txt
+++ b/Documentation/git-hash-object.txt
@@ -49,7 +49,7 @@ OPTIONS
--no-filters::
Hash the contents as is, ignoring any input filter that would
- have been chosen by the attributes mechanism, including crlf
+ have been chosen by the attributes mechanism, including the end-of-line
conversion. If the file is read from standard input then this
is always implied, unless the --path option is given.