tree ffb5cced1ece0bba1636b163b86f314e819a4620
parent e8ab941b671da6890181aea5b5755d1d9eea24ec
parent 6e6029a82acdb3d785eef15dc798f4d86c4ea445
author Junio C Hamano <gitster@pobox.com> 1596314952 -0700
committer Junio C Hamano <gitster@pobox.com> 1596314953 -0700

Merge branch 'jc/fmt-merge-msg-suppress-destination' into master

"git merge" learned to selectively omit " into <branch>" at the end
of the title of default merge message with merge.suppressDest
configuration.

* jc/fmt-merge-msg-suppress-destination:
  fmt-merge-msg: allow merge destination to be omitted again
  Revert "fmt-merge-msg: stop treating `master` specially"