Merge branch 'jc/xsha1' into next

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 796d049be69469b0ce0be61e9f5c88c19911d655..a29c633c8dfd15ee4bd3c8f4ae7aeceef91ea7fe 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -106,7 +106,7 @@ OPTIONS
        lines, show only handful hexdigits prefix.
        Non default number of digits can be specified with --abbrev=<n>.
 
---::
+\--::
        Do not interpret any more arguments as options.
 
 <file>::