user-manual: update for new default --track behavior

[git.git] / git-commit.sh

diff --git a/git-commit.sh b/git-commit.sh
index 4290ae2dd2747b26c521300af1ed5e46ab839264..d7e7028c15aeceaf2ba64a82ee9fc15f54b20eaa 100755 (executable)
--- 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