Merge branch 'jc/apply' into next

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index ae24547c8a03f5a2b9b850062c6237b35cff70c7..5e3112943d1947dbd8b58c23dd535eb4d527b80f 100644 (file)
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -26,7 +26,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).