From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Feb 2018 18:43:54 +0000 (-0800)
Subject: Merge branch 'ab/commit-m-with-fixup' into maint
X-Git-Tag: v2.16.3~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1ab3b8a44149a8dfb8968a958b13ac9e8d9579a;p=git

Merge branch 'ab/commit-m-with-fixup' into maint

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

c1ab3b8a44149a8dfb8968a958b13ac9e8d9579a