diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-01-23 21:16:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-23 21:16:38 (GMT) |
| commit | 5550449812e26d97d4a70251c5027b1015351c91 (patch) | |
| tree | b7c31e21a8dc41fae75388fc972d2643fe17b798 /Documentation | |
| parent | 86d7fcc40acc077638d51d2bf5133d5a66c5d959 (diff) | |
| parent | 30884c9afcd03aa7d9a0524fde3c96d2e29cf9a9 (diff) | |
| download | git-5550449812e26d97d4a70251c5027b1015351c91.zip git-5550449812e26d97d4a70251c5027b1015351c91.tar.gz git-5550449812e26d97d4a70251c5027b1015351c91.tar.bz2 | |
Merge branch 'ab/commit-m-with-fixup'
"git commit --fixup" did not allow "-m<message>" option to be used
at the same time; allow it to annotate resulting commit with more
text.
* ab/commit-m-with-fixup:
commit: add support for --fixup <commit> -m"<extra message>"
commit doc: document that -c, -C, -F and --fixup with -m error
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-commit.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 8c74a2c..f970a43 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -144,6 +144,8 @@ 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`, and `-F`. -t <file>:: --template=<file>:: |