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 /t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master | |
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 't/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master')
-rw-r--r-- | t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master index 0fc1e8cd71..b927fe4a98 100644 --- a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master +++ b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9 Author: A U Thor <author@example.com> Date: Mon Jun 26 00:04:00 2006 +0000 - Merge branch 'side' + Merge branch 'side' into master dir/sub | 2 ++ file0 | 3 +++ |