From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 Jan 2018 21:16:38 +0000 (-0800)
Subject: Merge branch 'ab/commit-m-with-fixup'
X-Git-Tag: v2.17.0-rc0~144
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5550449812e26d97d4a70251c5027b1015351c91

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
---

5550449812e26d97d4a70251c5027b1015351c91