Merge branch 'maint-1.7.0' into maint

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 6e4c220f205a8f4dd29527acf7b637c0e855239b..b586c0f442afd33c2875af26b83bb261de7361b0 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -12,7 +12,7 @@ SYNOPSIS
           [(-c | -C | --fixup | --squash) <commit>] [-F <file> | -m <msg>]
           [--reset-author] [--allow-empty] [--allow-empty-message] [--no-verify]
           [-e] [--author=<author>] [--date=<date>] [--cleanup=<mode>]
-          [--status | --no-status] [--] [[-i | -o ]<file>...]
+          [--status | --no-status] [-i | -o] [--] [<file>...]
 
 DESCRIPTION
 -----------