| commit | 5550449812e26d97d4a70251c5027b1015351c91 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 23 Jan 2018 21:16:38 +0000 (23 13:16 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 23 Jan 2018 21:16:38 +0000 (23 13:16 -0800) | ||
| tree | b7c31e21a8dc41fae75388fc972d2643fe17b798 | treesnapshot (tar.gz zip) |
| parent | 86d7fcc40acc077638d51d2bf5133d5a66c5d959 | commitdiff |
| parent | 30884c9afcd03aa7d9a0524fde3c96d2e29cf9a9 | commitdiff |
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
"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
| builtin/commit.c | diff1 | diff2 | blobhistory |
| t/t7500-commit.sh | diff1 | diff2 | blobhistory |