summaryrefslogtreecommitdiff
path: root/git-commit.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-08-02 01:14:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-08-02 01:15:43 (GMT)
commit6d4bbebd35e3a6e8091d7188f1c4d49af7f054e3 (patch)
tree8976d03e7f57d4b8813a33d88f120abc40b3744b /git-commit.sh
parent08874658b450600e72bb7cb0d0747c1ec4b0bfe1 (diff)
downloadgit-6d4bbebd35e3a6e8091d7188f1c4d49af7f054e3.zip
git-6d4bbebd35e3a6e8091d7188f1c4d49af7f054e3.tar.gz
git-6d4bbebd35e3a6e8091d7188f1c4d49af7f054e3.tar.bz2
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-xgit-commit.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/git-commit.sh b/git-commit.sh
index 4290ae2..d7e7028 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