Merge branch 'jc/upload-corrupt' into next

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 0a7365b9a80ed0d134bccb3fbe4baacc59056423..0fe66f2d0c84003d285fed426181998063e86b96 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -98,7 +98,7 @@ but can be used to amend a merge commit.
        Instead of committing only the files specified on the
        command line, update them in the index file and then
        commit the whole index.  This is the traditional
-       behaviour.
+       behavior.
 
 -o|--only::
        Commit only the files specified on the command line.
@@ -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>...::