Merge branch 'gs/rebase-allow-empty-message' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 8 Feb 2018 23:08:31 +0000 (15:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Feb 2018 23:08:31 +0000 (15:08 -0800)
"git rebase" learned to take "--allow-empty-message" option.

* gs/rebase-allow-empty-message:
rebase: add --allow-empty-message option

1  2 
builtin/rebase--helper.c
Simple merge