From: Ævar Arnfjörð Bjarmason Date: Fri, 22 Dec 2017 16:00:55 GMT Subject: [PATCH v2 1/2] commit doc: document that -c, -C, -F and --fixup with -m error Message-ID: <20171222160056.10102-2-avarab@gmail.com> In-Reply-To: <20171222160056.10102-1-avarab@gmail.com> 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 --- 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.15.1.424.g9478a66081