diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-06-23 22:33:23 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-06-23 17:22:35 -0700 |
commit | 489947cee5095b168cbac111ff7bd1eadbbd90dd (patch) | |
tree | ee24f367a7b5ded9fd17cdc4172d6c26cb3038fe /t/t4013/diff.log_-m_-p_master | |
parent | The second batch (diff) | |
download | tgif-489947cee5095b168cbac111ff7bd1eadbbd90dd.tar.xz |
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>
Diffstat (limited to 't/t4013/diff.log_-m_-p_master')
-rw-r--r-- | t/t4013/diff.log_-m_-p_master | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4013/diff.log_-m_-p_master b/t/t4013/diff.log_-m_-p_master index 9ca62a01ed..2acf43a9fb 100644 --- a/t/t4013/diff.log_-m_-p_master +++ b/t/t4013/diff.log_-m_-p_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 diff --git a/dir/sub b/dir/sub index cead32e..992913c 100644 @@ -33,7 +33,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 diff --git a/dir/sub b/dir/sub index 7289e35..992913c 100644 |