diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2017-12-22 16:00:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-22 19:20:47 (GMT) |
| commit | f55e84fff9b53e532a874f39384a3bcbb9292f28 (patch) | |
| tree | 87e9104c3a76337ee66c434c736dc11fb9f89b4d /Documentation/git-commit.txt | |
| parent | 936d1b989416a95f593bf81ccae8ac62cd83f279 (diff) | |
| download | git-f55e84fff9b53e532a874f39384a3bcbb9292f28.zip git-f55e84fff9b53e532a874f39384a3bcbb9292f28.tar.gz git-f55e84fff9b53e532a874f39384a3bcbb9292f28.tar.bz2 | |
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>
Diffstat (limited to 'Documentation/git-commit.txt')
| -rw-r--r-- | Documentation/git-commit.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 8c74a2c..3fbb735 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -144,6 +144,9 @@ OPTIONS Use the given <msg> 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 <file>:: --template=<file>:: |