]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8ab941 6e6029a)
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)
"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"


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.