Merge branch 'ab/commit-m-with-fixup' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 18:43:54 +0000 (10:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 18:43:54 +0000 (10:43 -0800)
"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

1  2 
builtin/commit.c
t/t7500-commit.sh

Simple merge
Simple merge