commit doc: document that -c, -C, -F and --fixup with -m error
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 <sunshine@sunshineco.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Dec 22, 2017 at 16:00 UTC
f55e84fff9b53e532a874f39384a3bcbb9292f28
1 file changed
+3
Documentation/git-commit.txt
+3
@@ -144,6 +144,9 @@ OPTIONS
144
Use the given <msg> as the commit message.
145
If multiple `-m` options are given, their values are
146
concatenated as separate paragraphs.
147
++
148
+The `-m` option is mutually exclusive with `-c`, `-C`, `-F`, and
149
+`--fixup`.
150
151
-t <file>::
152
--template=<file>::