git-commit.txt: Correct option alternatives
This patch fixes the SYNOPSIS in git-commit.txt: * --amend could be used in conjunction with -c/-C/-F/-m; it is not mutually exclusive with them. * -m and -F are not alternative options to -c/-C; you can reuse authorship from a commit (-c/-C) but change the message (-m/-F). Furthermore, for long-option consistency --author <author> is changed to --author=<author>. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stephan Beyer committed
Jun 7, 2008 at 13:06 UTC
c4a7ff52bda5c2e4cd08074ce4c27dbc0fc5242a
1 file changed
+4
-4
Documentation/git-commit.txt
+4
-4
@@ -8,9 +8,9 @@ git-commit - Record changes to the repository
8
SYNOPSIS
9
--------
10
[verse]
11
-'git-commit' [-a | --interactive] [-s] [-v] [-u]
12
- [(-c | -C) <commit> | -F <file> | -m <msg> | --amend]
13
- [--allow-empty] [--no-verify] [-e] [--author <author>]
11
+'git-commit' [-a | --interactive] [-s] [-v] [-u] [--amend]
12
+ [(-c | -C) <commit>] [-F <file> | -m <msg>]
13
+ [--allow-empty] [--no-verify] [-e] [--author=<author>]
14
[--cleanup=<mode>] [--] [[-i | -o ]<file>...]
15
16
DESCRIPTION
@@ -68,7 +68,7 @@ OPTIONS
68
Take the commit message from the given file. Use '-' to
69
read the message from the standard input.
70
71
---author <author>::
71
+--author=<author>::
72
Override the author name used in the commit. Use
73
`A U Thor <author@example.com>` format.
74