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.diff-tree_--cc_--patch-with-stat_main | |
| parent | d235f69ae880aba0a29841c61eec214f59b19650 (diff) | |
| parent | 5590b4e7f52017794169a93d571204141bab3d28 (diff) | |
| download | git-e50c3ca095b33a941833ffab150b8822099d1b75.tar.xz | |
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.diff-tree_--cc_--patch-with-stat_main')
| -rw-r--r-- | t/t4013/diff.diff-tree_--cc_--patch-with-stat_main | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_main b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_main new file mode 100644 index 0000000000..0ec6042097 --- /dev/null +++ b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_main @@ -0,0 +1,34 @@ +$ git diff-tree --cc --patch-with-stat main +59d314ad6f356dd08601a4cd5e530381da3e3c64 + dir/sub | 2 ++ + file0 | 3 +++ + 2 files changed, 5 insertions(+) + +diff --cc dir/sub +index cead32e,7289e35..992913c +--- a/dir/sub ++++ b/dir/sub +@@@ -1,6 -1,4 +1,8 @@@ + A + B + +C + +D + +E + +F ++ 1 ++ 2 +diff --cc file0 +index b414108,f4615da..10a8a9f +--- a/file0 ++++ b/file0 +@@@ -1,6 -1,6 +1,9 @@@ + 1 + 2 + 3 + +4 + +5 + +6 ++ A ++ B ++ C +$ |