]> git.ipfire.org Git - thirdparty/git.git/commit - t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
fmt-merge-msg: stop treating `master` specially
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 23 Jun 2020 22:33:23 +0000 (22:33 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2020 00:22:35 +0000 (17:22 -0700)
commit489947cee5095b168cbac111ff7bd1eadbbd90dd
treeee24f367a7b5ded9fd17cdc4172d6c26cb3038fe
parent0313f36c6ebecb3bffe6f15cf25a4883100f0214
fmt-merge-msg: stop treating `master` specially

In the context of many projects renaming their primary branch names away
from `master`, Git wants to stop treating the `master` branch specially.

Let's start with `git fmt-merge-msg`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
29 files changed:
fmt-merge-msg.c
t/t1507-rev-parse-upstream.sh
t/t4013-diff-various.sh
t/t4013/diff.log_--decorate=full_--all
t/t4013/diff.log_--decorate_--all
t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
t/t4013/diff.log_--patch-with-stat_master
t/t4013/diff.log_--patch-with-stat_master_--_dir_
t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
t/t4013/diff.log_--root_--patch-with-stat_--summary_master
t/t4013/diff.log_--root_--patch-with-stat_master
t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
t/t4013/diff.log_--root_-p_master
t/t4013/diff.log_--root_master
t/t4013/diff.log_-m_-p_--first-parent_master
t/t4013/diff.log_-m_-p_master
t/t4013/diff.log_-p_--first-parent_master
t/t4013/diff.log_-p_master
t/t4013/diff.log_master
t/t4013/diff.show_--first-parent_master
t/t4013/diff.show_-c_master
t/t4013/diff.show_-m_master
t/t4013/diff.show_master
t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
t/t4202-log.sh
t/t6200-fmt-merge-msg.sh
t/t7600-merge.sh
t/t7608-merge-messages.sh