From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 1 Aug 2020 20:49:12 +0000 (-0700)
Subject: Merge branch 'jc/fmt-merge-msg-suppress-destination' into master
X-Git-Tag: v2.29.0-rc0~198
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=341a196ab6603aa7be709812132fd906a3d2359c;p=thirdparty%2Fgit.git

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

341a196ab6603aa7be709812132fd906a3d2359c