877176e0b0
Remove one of the last remaining uses of
"TEST_GIT_DEFAULT_INITIAL_BRANCH= main" in the test suite. We have
been steadily be converting tests from using "master" as the default
branch name since the introduction of TEST_GIT_DEFAULT_INITIAL_BRANCH
in 704fed9ea2 (tests: start moving to a different default main branch
name, 2020-10-23) The changes here are purely mechanical replacing
"master" with "main"
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
31 lines
444 B
Plaintext
31 lines
444 B
Plaintext
$ git show --first-parent main
|
|
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
|
|
Merge: 9a6d494 c7a2ab9
|
|
Author: A U Thor <author@example.com>
|
|
Date: Mon Jun 26 00:04:00 2006 +0000
|
|
|
|
Merge branch 'side'
|
|
|
|
diff --git a/dir/sub b/dir/sub
|
|
index cead32e..992913c 100644
|
|
--- a/dir/sub
|
|
+++ b/dir/sub
|
|
@@ -4,3 +4,5 @@ C
|
|
D
|
|
E
|
|
F
|
|
+1
|
|
+2
|
|
diff --git a/file0 b/file0
|
|
index b414108..10a8a9f 100644
|
|
--- a/file0
|
|
+++ b/file0
|
|
@@ -4,3 +4,6 @@
|
|
4
|
|
5
|
|
6
|
|
+A
|
|
+B
|
|
+C
|
|
$
|