diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-09-29 11:40:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-09-29 11:40:34 -0700 |
| commit | e50c3ca095b33a941833ffab150b8822099d1b75 (patch) | |
| tree | 5d6724993867cb213ba84079ac465a263cf610f2 /t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ | |
| parent | d235f69ae880aba0a29841c61eec214f59b19650 (diff) | |
| parent | 5590b4e7f52017794169a93d571204141bab3d28 (diff) | |
| download | git-e50c3ca095b33a941833ffab150b8822099d1b75.tar.gz git-e50c3ca095b33a941833ffab150b8822099d1b75.zip | |
Merge branch 'pw/3.0-default-initial-branch-to-main'
Declare that "git init" that is not otherwise configured uses
'main' as the initial branch, not 'master', starting Git 3.0.
* pw/3.0-default-initial-branch-to-main:
t0613: stop setting default initial branch
t9902: switch default branch name to main
t4013: switch default branch name to main
breaking-changes: switch default branch to main
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..master^^')
| -rw-r--r-- | t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ b/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ deleted file mode 100644 index caec5537de..0000000000 --- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ +++ /dev/null @@ -1,62 +0,0 @@ -$ git format-patch --inline --stdout initial..master^^ -From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:01:00 +0000 -Subject: [DIFFERENT_PREFIX] Second -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - - -This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0001-Second.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: inline; filename="0001-Second.patch" - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - ---------------g-i-t--v-e-r-s-i-o-n-- - - -$ |