From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 7 Jul 2020 05:09:17 +0000 (-0700)
Subject: Merge branch 'js/default-branch-name'
X-Git-Tag: v2.28.0-rc0~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11cbda2add5d3eb7c415f1f6dd8186181a7f9874;p=thirdparty%2Fgit.git

Merge branch 'js/default-branch-name'

The name of the primary branch in existing repositories, and the
default name used for the first branch in newly created
repositories, is made configurable, so that we can eventually wean
ourselves off of the hardcoded 'master'.

* js/default-branch-name:
  contrib: subtree: adjust test to change in fmt-merge-msg
  testsvn: respect `init.defaultBranch`
  remote: use the configured default branch name when appropriate
  clone: use configured default branch name when appropriate
  init: allow setting the default for the initial branch name via the config
  init: allow specifying the initial branch name for the new repository
  docs: add missing diamond brackets
  submodule: fall back to remote's HEAD for missing remote.<name>.branch
  send-pack/transport-helper: avoid mentioning a particular branch
  fmt-merge-msg: stop treating `master` specially
---

11cbda2add5d3eb7c415f1f6dd8186181a7f9874