From: Stephan Beyer Date: Sat, 07 Jun 2008 11:06:45 GMT Subject: [PATCH v2] git-commit.txt: Correct option alternatives Message-ID: <1212836805-20684-1-git-send-email-s-beyer@gmx.net> In-Reply-To: <200806070534.45761.chriscool@tuxfamily.org> This patch fixes the SYNOPSIS in git-commit.txt: * --amend is not an alternative option to -c/-C/-F/-m * -m and -F are not alternative options to -c/-C, because you can reuse authorship from a commit (-c/-C) but change the message (-m/-F). Furthermore, for long-option consistency --author is changed to --author=. Signed-off-by: Stephan Beyer --- Thanks, Christian. Sometimes I'm too blind. Documentation/git-commit.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 02d4baa..40bf63e 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -8,9 +8,9 @@ git-commit - Record changes to the repository SYNOPSIS -------- [verse] -'git-commit' [-a | --interactive] [-s] [-v] [-u] - [(-c | -C) | -F | -m | --amend] - [--allow-empty] [--no-verify] [-e] [--author ] +'git-commit' [-a | --interactive] [-s] [-v] [-u] [--amend] + [(-c | -C) ] [-F | -m ] + [--allow-empty] [--no-verify] [-e] [--author=] [--cleanup=] [--] [[-i | -o ]...] DESCRIPTION @@ -68,7 +68,7 @@ OPTIONS Take the commit message from the given file. Use '-' to read the message from the standard input. ---author :: +--author=:: Override the author name used in the commit. Use `A U Thor ` format. -- 1.5.5.1