diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-08-01 18:14:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-08-01 18:15:43 -0700 |
| commit | 6d4bbebd35e3a6e8091d7188f1c4d49af7f054e3 (patch) | |
| tree | 8976d03e7f57d4b8813a33d88f120abc40b3744b /git-commit.sh | |
| parent | git-sh-setup.sh: make GIT_EDITOR/core.editor/VISUAL/EDITOR accept commands (diff) | |
| download | tgif-6d4bbebd35e3a6e8091d7188f1c4d49af7f054e3.tar.xz | |
git-commit.sh: Permit the --amend message to be given with -m/-c/-C/-F.
[jc: adjusted t/t7501 as this makes -F and --amend compatible]
Signed-off-by: David Kastrup <dak@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-commit.sh')
| -rwxr-xr-x | git-commit.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/git-commit.sh b/git-commit.sh index 4290ae2dd2..d7e7028c15 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -190,7 +190,6 @@ $1" ;; --a|--am|--ame|--amen|--amend) amend=t - log_given=t$log_given use_commit=HEAD shift ;; @@ -298,9 +297,9 @@ esac case "$log_given" in tt*) - die "Only one of -c/-C/-F/--amend can be used." ;; + die "Only one of -c/-C/-F can be used." ;; *tm*|*mt*) - die "Option -m cannot be combined with -c/-C/-F/--amend." ;; + die "Option -m cannot be combined with -c/-C/-F." ;; esac case "$#,$also,$only,$amend" in |