From f55e84fff9b53e532a874f39384a3bcbb9292f28 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Fri, 22 Dec 2017 16:00:55 +0000 Subject: [PATCH] commit doc: document that -c, -C, -F and --fixup with -m error MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Document that providing any of -c, -C, -F and --fixup along with -m will result in an error. Some variant of this has been errored about explicitly since 0c091296c0 ("git-commit: log parameter updates.", 2005-08-08), but the documentation was never updated to reflect this. Wording-by: Eric Sunshine Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- Documentation/git-commit.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 8c74a2ca03..3fbb7352bc 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -144,6 +144,9 @@ OPTIONS Use the given as the commit message. If multiple `-m` options are given, their values are concatenated as separate paragraphs. ++ +The `-m` option is mutually exclusive with `-c`, `-C`, `-F`, and +`--fixup`. -t :: --template=:: -- 2.11.4.GIT