On Wed, Dec 20, 2017 at 2:38 PM, Ævar Arnfjörð Bjarmason
[off-list ref] wrote:
quoted hunk ↗ jump to hunk
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.
Signed-off-by: Ævar Arnfjörð Bjarmason <redacted>
---diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
@@ -144,6 +144,9 @@ OPTIONS
++
+Combining the `-m` option and any of `-c`, `-C`, `-F` or `--fixup`
+will result in an error.
This sounds a bit scary, as if there is something wrong with Git.
Perhaps say instead that they are "mutually exclusive":
The `-m` option is mutually exclusive with `-c`, `-C`, `-F`, and
`--fixup`.
Or something.