From: Jari Aalto <jari.aalto@cante.net>
Date: Wed, 1 Dec 2010 14:51:25 +0000 (+0200)
Subject: git-commit.txt: (synopsis): move -i and -o before "--"
X-Git-Tag: v1.7.2.4~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dc91e1b2cbb74797ad60a39d571553f9cd3419f6;p=git.git

git-commit.txt: (synopsis): move -i and -o before "--"

All options, including -i and -o, must come before "--" which is the
end of options marker.

Reported-by: Joey Hess <joey@kitenet.net>
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 42fb1f57b..ec7b577b8 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -11,8 +11,8 @@ SYNOPSIS
 'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run]
 	   [(-c | -C) <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>...]
+	   [--date=<date>] [--cleanup=<mode>] [--status | --no-status]
+	   [-i | -o] [--] [<file>...]
 
 DESCRIPTION
 -----------