Merge branch 'lt/oneway' into next

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 0a7365b9a80ed0d134bccb3fbe4baacc59056423..38df59ce2357fcd37810b2aaca9d759e9138e654 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -106,7 +106,7 @@ but can be used to amend a merge commit.
        index and the latest commit does not match on the
        specified paths to avoid confusion.
 
---::
+\--::
        Do not interpret any more arguments as options.
 
 <file>...::