Merge branch 'mh/p4'

diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
index 6904739a48443ba255b2506ad92c10f91fa61d21..51edeecbe5b546c6fbbbe117f39b51f352cb6bc8 100644 (file)
--- 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.