Documentation: --amend cannot be combined with -c/-C/-F.
authorPeter Eriksen <s022018@student.dtu.dk>
Wed, 24 Jan 2007 19:54:46 +0000 (20:54 +0100)
committerJunio C Hamano <junkio@cox.net>
Wed, 24 Jan 2007 23:32:52 +0000 (15:32 -0800)
commit497171e765b7b4f903d21379bee050380e539cf3
tree49ae51c0c242ac6baab59440dd4de61cee4df750
parent191453f66449537da29e9fc156f7a981845ea8f6
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>
Documentation/git-commit.txt
git-commit.sh