[PATCH] Documentation: --amend cannot be combined with -c/-C/-F.
- From
- Peter Eriksen <s022018@student.dtu.dk>
- Date
- Jan 24, 2007, 19:54 UTC
- Message-ID
- <20070124195446.GA13817@bohr.gbar.dtu.dk>
We used to get the following confusing error message:
% git commit --amend -a -m foo Option -m cannot be combined with -c/-C/-F
This is because --amend cannot be combined with -c/-C/-F, which makes sense, because they try to handle the same log message in different ways. So update the documentation to reflect this.
Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> ---
This problem was reported by tko on #git. What do you think? It is not a "complete" fix, since --reuse, and --reedit have the same problem, but they are not even mentioned in the man page of git-commit.
Documentation/git-commit.txt | 4 ++-- git-commit.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 532703a..2187eee 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -8,8 +8,8 @@ git-commit - Record changes to the repository SYNOPSIS -------- [verse] -'git-commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>] - [--no-verify] [--amend] [-e] [--author <author>] +'git-commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg> | + --amend] [--no-verify] [-e] [--author <author>] [--] [[-i | -o ]<file>...] DESCRIPTION diff --git a/git-commit.sh b/git-commit.sh index 6f4dcdb..830ba76 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -3,7 +3,7 @@ # Copyright (c) 2005 Linus Torvalds # Copyright (c) 2006 Junio C Hamano -USAGE='[-a] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>] [-u] [--amend] [-e] [--author <author>] [[-i | -o] <path>...]' +USAGE='[-a] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit> | --amend] [-u] [-e] [--author <author>] [[-i | -o] <path>...]' SUBDIRECTORY_OK=Yes . git-sh-setup require_work_tree @@ -284,9 +284,9 @@ esac case "$log_given" in tt*) - die "Only one of -c/-C/-F can be used." ;; + die "Only one of -c/-C/-F/--a can be used." ;; *tm*|*mt*) - die "Option -m cannot be combined with -c/-C/-F." ;; + die "Option -m cannot be combined with -c/-C/-F/--a." ;; esac case "$#,$also,$only,$amend" in
-- 1.5.0.rc2.gc9a89-dirty