diff options
| author | Peter Eriksen <s022018@student.dtu.dk> | 2007-01-24 20:54:46 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-24 15:32:52 -0800 |
| commit | 497171e765b7b4f903d21379bee050380e539cf3 (patch) | |
| tree | 49ae51c0c242ac6baab59440dd4de61cee4df750 | |
| parent | 191453f66449537da29e9fc156f7a981845ea8f6 (diff) | |
| download | git-497171e765b7b4f903d21379bee050380e539cf3.tar.gz git-497171e765b7b4f903d21379bee050380e539cf3.tar.xz | |
Documentation: --amend cannot be combined with -c/-C/-F.
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>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/git-commit.txt | 4 | ||||
| -rwxr-xr-x | git-commit.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 532703a67..2187eee41 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 6f4dcdbcc..d8c236b24 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/--amend 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/--amend." ;; esac case "$#,$also,$only,$amend" in |