Merge branch 'master' into cc/trace

diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index c9c3088424ebd45e2220efde104e47b6e4cd8316..66fc478f5736957d56de10ddc69c5c0fd9aad9c6 100644 (file)
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -32,7 +32,7 @@ OPTIONS
 -v::
         Be verbose.
 
---::
+\--::
        This option can be used to separate command-line options from
        the list of files, (useful when filenames might be mistaken
        for command-line options).