]> git.ipfire.org Git - thirdparty/git.git/commit - t/t9108-git-svn-glob.sh
Merge branch 'jc/fmt-merge-msg-suppress-destination' into master
authorJunio C Hamano <gitster@pobox.com>
Sat, 1 Aug 2020 20:49:12 +0000 (13:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 1 Aug 2020 20:49:13 +0000 (13:49 -0700)
commit341a196ab6603aa7be709812132fd906a3d2359c
treeffb5cced1ece0bba1636b163b86f314e819a4620
parente8ab941b671da6890181aea5b5755d1d9eea24ec
parent6e6029a82acdb3d785eef15dc798f4d86c4ea445
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"