diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-07-07 08:09:17 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-07 08:09:17 +0300 |
| commit | 11cbda2add5d3eb7c415f1f6dd8186181a7f9874 (patch) | |
| tree | 7d722860aa28b92087406bf063c7ad6fe6c45c30 /transport-helper.c | |
| parent | 480e78595ea531482018826d35fed0fb0529afa2 (diff) | |
| parent | 508fd8e8baf3e18ee40b2cf0b8899188a8506d07 (diff) | |
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
Diffstat (limited to 'transport-helper.c')
| -rw-r--r-- | transport-helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/transport-helper.c b/transport-helper.c index ad0bf8e18d..c6b753bfae 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -1050,7 +1050,7 @@ static int push_refs(struct transport *transport, if (!remote_refs) { fprintf(stderr, _("No refs in common and none specified; doing nothing.\n" - "Perhaps you should specify a branch such as 'master'.\n")); + "Perhaps you should specify a branch.\n")); return 0; } |