+110 -110

t/t4013-diff-various.sh

··· 5 6 test_description='Various diff formatting options' 7 8 - GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master 9 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME 10 11 . ./test-lib.sh ··· 70 GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" && 71 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE && 72 73 - git checkout master && 74 git pull -s ours --no-rebase . side && 75 76 GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" && ··· 95 test_write_lines B A >dir/sub && 96 git add dir/sub && 97 git commit -m "Rearranged lines in dir/sub" && 98 - git checkout master && 99 100 GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" && 101 GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" && ··· 103 git checkout -b mode initial && 104 git update-index --chmod=+x file0 && 105 git commit -m "update mode" && 106 - git checkout -f master && 107 108 GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" && 109 GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" && ··· 112 git update-index --chmod=+x file2 && 113 git commit -m "update mode (file2)" && 114 git notes add -m "note" && 115 - git checkout -f master && 116 117 - # Same merge as master, but with parents reversed. Hide it in a 118 # pseudo-ref to avoid impacting tests with --all. 119 commit=$(echo reverse | 120 - git commit-tree -p master^2 -p master^1 master^{tree}) && 121 git update-ref REVERSE $commit && 122 123 git config diff.renames false && ··· 127 128 : <<\EOF 129 ! [initial] Initial 130 - * [master] Merge branch 'side' 131 ! [rearrange] Rearranged lines in dir/sub 132 ! [side] Side 133 ---- 134 + [rearrange] Rearranged lines in dir/sub 135 - - [master] Merge branch 'side' 136 * + [side] Side 137 - * [master^] Third 138 - * [master~2] Second 139 +*++ [initial] Initial 140 EOF 141 ··· 311 diff-tree --stat initial mode 312 diff-tree --summary initial mode 313 314 - diff-tree master 315 - diff-tree -m master 316 - diff-tree -p master 317 - diff-tree -p -m master 318 - diff-tree -c master 319 - diff-tree -c --abbrev master 320 - :noellipses diff-tree -c --abbrev master 321 - diff-tree --cc master 322 # stat only should show the diffstat with the first parent 323 - diff-tree -c --stat master 324 - diff-tree --cc --stat master 325 - diff-tree -c --stat --summary master 326 - diff-tree --cc --stat --summary master 327 # stat summary should show the diffstat and summary with the first parent 328 diff-tree -c --stat --summary side 329 diff-tree --cc --stat --summary side 330 - diff-tree --cc --shortstat master 331 diff-tree --cc --summary REVERSE 332 # improved by Timo's patch 333 - diff-tree --cc --patch-with-stat master 334 # improved by Timo's patch 335 - diff-tree --cc --patch-with-stat --summary master 336 # this is correct 337 diff-tree --cc --patch-with-stat --summary side 338 339 - log master 340 - log -p master 341 - log --root master 342 - log --root -p master 343 - log --patch-with-stat master 344 - log --root --patch-with-stat master 345 - log --root --patch-with-stat --summary master 346 # improved by Timo's patch 347 - log --root -c --patch-with-stat --summary master 348 # improved by Timo's patch 349 - log --root --cc --patch-with-stat --summary master 350 - log --no-diff-merges -p --first-parent master 351 - log --diff-merges=off -p --first-parent master 352 - log --first-parent --diff-merges=off -p master 353 - log -p --first-parent master 354 - log -p --diff-merges=first-parent master 355 - log --diff-merges=first-parent master 356 - log -m -p --first-parent master 357 - log -m -p master 358 - log --cc -m -p master 359 - log -c -m -p master 360 - log -m --raw master 361 - log -m --stat master 362 - log -SF master 363 - log -S F master 364 - log -SF -p master 365 - log -SF master --max-count=0 366 - log -SF master --max-count=1 367 - log -SF master --max-count=2 368 - log -GF master 369 - log -GF -p master 370 - log -GF -p --pickaxe-all master 371 - log -IA -IB -I1 -I2 -p master 372 log --decorate --all 373 log --decorate=full --all 374 log --decorate --clear-decorations --all ··· 377 rev-list --parents HEAD 378 rev-list --children HEAD 379 380 - whatchanged master 381 - :noellipses whatchanged master 382 - whatchanged -p master 383 - whatchanged --root master 384 - :noellipses whatchanged --root master 385 - whatchanged --root -p master 386 - whatchanged --patch-with-stat master 387 - whatchanged --root --patch-with-stat master 388 - whatchanged --root --patch-with-stat --summary master 389 # improved by Timo's patch 390 - whatchanged --root -c --patch-with-stat --summary master 391 # improved by Timo's patch 392 - whatchanged --root --cc --patch-with-stat --summary master 393 - whatchanged -SF master 394 - :noellipses whatchanged -SF master 395 - whatchanged -SF -p master 396 397 - log --patch-with-stat master -- dir/ 398 - whatchanged --patch-with-stat master -- dir/ 399 - log --patch-with-stat --summary master -- dir/ 400 - whatchanged --patch-with-stat --summary master -- dir/ 401 402 show initial 403 show --root initial 404 show side 405 - show master 406 - show -c master 407 - show -m master 408 - show --first-parent master 409 show --stat side 410 show --stat --summary side 411 show --patch-with-stat side ··· 414 show --patch-with-stat --summary side 415 416 format-patch --stdout initial..side 417 - format-patch --stdout initial..master^ 418 - format-patch --stdout initial..master 419 - format-patch --stdout --no-numbered initial..master 420 - format-patch --stdout --numbered initial..master 421 format-patch --attach --stdout initial..side 422 format-patch --attach --stdout --suffix=.diff initial..side 423 - format-patch --attach --stdout initial..master^ 424 - format-patch --attach --stdout initial..master 425 format-patch --inline --stdout initial..side 426 - format-patch --inline --stdout initial..master^ 427 - format-patch --inline --stdout --numbered-files initial..master 428 - format-patch --inline --stdout initial..master 429 - format-patch --inline --stdout --subject-prefix=TESTCASE initial..master 430 config format.subjectprefix DIFFERENT_PREFIX 431 - format-patch --inline --stdout initial..master^^ 432 - format-patch --stdout --cover-letter -n initial..master^ 433 434 diff --abbrev initial..side 435 diff -U initial..side ··· 448 diff --no-index --name-status dir2 dir 449 diff --no-index --name-status -- dir2 dir 450 diff --no-index dir dir3 451 - diff master master^ side 452 # Can't use spaces... 453 - diff --line-prefix=abc master master^ side 454 - diff --dirstat master~1 master~2 455 diff --dirstat initial rearrange 456 diff --dirstat-by-file initial rearrange 457 - diff --dirstat --cc master~1 master 458 # No-index --abbrev and --no-abbrev 459 diff --raw initial 460 :noellipses diff --raw initial ··· 482 ' 483 484 test_expect_success 'log -m matches pure log' ' 485 - git log master >result && 486 process_diffs result >expected && 487 git log -m >result && 488 process_diffs result >actual && ··· 490 ' 491 492 test_expect_success 'log --diff-merges=on matches --diff-merges=separate' ' 493 - git log -p --diff-merges=separate master >result && 494 process_diffs result >expected && 495 - git log -p --diff-merges=on master >result && 496 process_diffs result >actual && 497 test_cmp expected actual 498 ' 499 500 test_expect_success 'log --dd matches --diff-merges=1 -p' ' 501 - git log --diff-merges=1 -p master >result && 502 process_diffs result >expected && 503 - git log --dd master >result && 504 process_diffs result >actual && 505 test_cmp expected actual 506 ' ··· 511 ' 512 513 test_expect_success 'git config log.diffMerges first-parent' ' 514 - git log -p --diff-merges=first-parent master >result && 515 process_diffs result >expected && 516 test_config log.diffMerges first-parent && 517 - git log -p --diff-merges=on master >result && 518 process_diffs result >actual && 519 test_cmp expected actual 520 ' 521 522 test_expect_success 'git config log.diffMerges first-parent vs -m' ' 523 - git log -p --diff-merges=first-parent master >result && 524 process_diffs result >expected && 525 test_config log.diffMerges first-parent && 526 - git log -p -m master >result && 527 process_diffs result >actual && 528 test_cmp expected actual 529 ' ··· 572 Third 573 Second 574 EOF 575 - git rev-list master | git diff-tree --stdin --format=%s -s >actual && 576 test_cmp expect actual 577 ' 578 ··· 585 586 dir/sub 587 EOF 588 - git rev-list master^ | 589 git diff-tree -r --stdin --name-only --format=%s dir >actual && 590 test_cmp expect actual 591 ' 592 593 test_expect_success 'show A B ... -- <pathspec>' ' 594 # side touches dir/sub, file0, and file3 595 - # master^ touches dir/sub, and file1 596 - # master^^ touches dir/sub, file0, and file2 597 - git show --name-only --format="<%s>" side master^ master^^ -- dir >actual && 598 cat >expect <<-\EOF && 599 <Side> 600 ··· 610 ' 611 612 test_expect_success 'diff -I<regex>: setup' ' 613 - git checkout master && 614 test_seq 50 >file0 && 615 git commit -m "Set up -I<regex> test file" file0 && 616 test_seq 50 | sed -e "s/13/ten and three/" -e "/7\$/d" >file0 &&

··· 5 6 test_description='Various diff formatting options' 7 8 + GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main 9 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME 10 11 . ./test-lib.sh ··· 70 GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" && 71 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE && 72 73 + git checkout main && 74 git pull -s ours --no-rebase . side && 75 76 GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" && ··· 95 test_write_lines B A >dir/sub && 96 git add dir/sub && 97 git commit -m "Rearranged lines in dir/sub" && 98 + git checkout main && 99 100 GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" && 101 GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" && ··· 103 git checkout -b mode initial && 104 git update-index --chmod=+x file0 && 105 git commit -m "update mode" && 106 + git checkout -f main && 107 108 GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" && 109 GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" && ··· 112 git update-index --chmod=+x file2 && 113 git commit -m "update mode (file2)" && 114 git notes add -m "note" && 115 + git checkout -f main && 116 117 + # Same merge as main, but with parents reversed. Hide it in a 118 # pseudo-ref to avoid impacting tests with --all. 119 commit=$(echo reverse | 120 + git commit-tree -p main^2 -p main^1 main^{tree}) && 121 git update-ref REVERSE $commit && 122 123 git config diff.renames false && ··· 127 128 : <<\EOF 129 ! [initial] Initial 130 + * [main] Merge branch 'side' 131 ! [rearrange] Rearranged lines in dir/sub 132 ! [side] Side 133 ---- 134 + [rearrange] Rearranged lines in dir/sub 135 + - [main] Merge branch 'side' 136 * + [side] Side 137 + * [main^] Third 138 + * [main~2] Second 139 +*++ [initial] Initial 140 EOF 141 ··· 311 diff-tree --stat initial mode 312 diff-tree --summary initial mode 313 314 + diff-tree main 315 + diff-tree -m main 316 + diff-tree -p main 317 + diff-tree -p -m main 318 + diff-tree -c main 319 + diff-tree -c --abbrev main 320 + :noellipses diff-tree -c --abbrev main 321 + diff-tree --cc main 322 # stat only should show the diffstat with the first parent 323 + diff-tree -c --stat main 324 + diff-tree --cc --stat main 325 + diff-tree -c --stat --summary main 326 + diff-tree --cc --stat --summary main 327 # stat summary should show the diffstat and summary with the first parent 328 diff-tree -c --stat --summary side 329 diff-tree --cc --stat --summary side 330 + diff-tree --cc --shortstat main 331 diff-tree --cc --summary REVERSE 332 # improved by Timo's patch 333 + diff-tree --cc --patch-with-stat main 334 # improved by Timo's patch 335 + diff-tree --cc --patch-with-stat --summary main 336 # this is correct 337 diff-tree --cc --patch-with-stat --summary side 338 339 + log main 340 + log -p main 341 + log --root main 342 + log --root -p main 343 + log --patch-with-stat main 344 + log --root --patch-with-stat main 345 + log --root --patch-with-stat --summary main 346 # improved by Timo's patch 347 + log --root -c --patch-with-stat --summary main 348 # improved by Timo's patch 349 + log --root --cc --patch-with-stat --summary main 350 + log --no-diff-merges -p --first-parent main 351 + log --diff-merges=off -p --first-parent main 352 + log --first-parent --diff-merges=off -p main 353 + log -p --first-parent main 354 + log -p --diff-merges=first-parent main 355 + log --diff-merges=first-parent main 356 + log -m -p --first-parent main 357 + log -m -p main 358 + log --cc -m -p main 359 + log -c -m -p main 360 + log -m --raw main 361 + log -m --stat main 362 + log -SF main 363 + log -S F main 364 + log -SF -p main 365 + log -SF main --max-count=0 366 + log -SF main --max-count=1 367 + log -SF main --max-count=2 368 + log -GF main 369 + log -GF -p main 370 + log -GF -p --pickaxe-all main 371 + log -IA -IB -I1 -I2 -p main 372 log --decorate --all 373 log --decorate=full --all 374 log --decorate --clear-decorations --all ··· 377 rev-list --parents HEAD 378 rev-list --children HEAD 379 380 + whatchanged main 381 + :noellipses whatchanged main 382 + whatchanged -p main 383 + whatchanged --root main 384 + :noellipses whatchanged --root main 385 + whatchanged --root -p main 386 + whatchanged --patch-with-stat main 387 + whatchanged --root --patch-with-stat main 388 + whatchanged --root --patch-with-stat --summary main 389 # improved by Timo's patch 390 + whatchanged --root -c --patch-with-stat --summary main 391 # improved by Timo's patch 392 + whatchanged --root --cc --patch-with-stat --summary main 393 + whatchanged -SF main 394 + :noellipses whatchanged -SF main 395 + whatchanged -SF -p main 396 397 + log --patch-with-stat main -- dir/ 398 + whatchanged --patch-with-stat main -- dir/ 399 + log --patch-with-stat --summary main -- dir/ 400 + whatchanged --patch-with-stat --summary main -- dir/ 401 402 show initial 403 show --root initial 404 show side 405 + show main 406 + show -c main 407 + show -m main 408 + show --first-parent main 409 show --stat side 410 show --stat --summary side 411 show --patch-with-stat side ··· 414 show --patch-with-stat --summary side 415 416 format-patch --stdout initial..side 417 + format-patch --stdout initial..main^ 418 + format-patch --stdout initial..main 419 + format-patch --stdout --no-numbered initial..main 420 + format-patch --stdout --numbered initial..main 421 format-patch --attach --stdout initial..side 422 format-patch --attach --stdout --suffix=.diff initial..side 423 + format-patch --attach --stdout initial..main^ 424 + format-patch --attach --stdout initial..main 425 format-patch --inline --stdout initial..side 426 + format-patch --inline --stdout initial..main^ 427 + format-patch --inline --stdout --numbered-files initial..main 428 + format-patch --inline --stdout initial..main 429 + format-patch --inline --stdout --subject-prefix=TESTCASE initial..main 430 config format.subjectprefix DIFFERENT_PREFIX 431 + format-patch --inline --stdout initial..main^^ 432 + format-patch --stdout --cover-letter -n initial..main^ 433 434 diff --abbrev initial..side 435 diff -U initial..side ··· 448 diff --no-index --name-status dir2 dir 449 diff --no-index --name-status -- dir2 dir 450 diff --no-index dir dir3 451 + diff main main^ side 452 # Can't use spaces... 453 + diff --line-prefix=abc main main^ side 454 + diff --dirstat main~1 main~2 455 diff --dirstat initial rearrange 456 diff --dirstat-by-file initial rearrange 457 + diff --dirstat --cc main~1 main 458 # No-index --abbrev and --no-abbrev 459 diff --raw initial 460 :noellipses diff --raw initial ··· 482 ' 483 484 test_expect_success 'log -m matches pure log' ' 485 + git log main >result && 486 process_diffs result >expected && 487 git log -m >result && 488 process_diffs result >actual && ··· 490 ' 491 492 test_expect_success 'log --diff-merges=on matches --diff-merges=separate' ' 493 + git log -p --diff-merges=separate main >result && 494 process_diffs result >expected && 495 + git log -p --diff-merges=on main >result && 496 process_diffs result >actual && 497 test_cmp expected actual 498 ' 499 500 test_expect_success 'log --dd matches --diff-merges=1 -p' ' 501 + git log --diff-merges=1 -p main >result && 502 process_diffs result >expected && 503 + git log --dd main >result && 504 process_diffs result >actual && 505 test_cmp expected actual 506 ' ··· 511 ' 512 513 test_expect_success 'git config log.diffMerges first-parent' ' 514 + git log -p --diff-merges=first-parent main >result && 515 process_diffs result >expected && 516 test_config log.diffMerges first-parent && 517 + git log -p --diff-merges=on main >result && 518 process_diffs result >actual && 519 test_cmp expected actual 520 ' 521 522 test_expect_success 'git config log.diffMerges first-parent vs -m' ' 523 + git log -p --diff-merges=first-parent main >result && 524 process_diffs result >expected && 525 test_config log.diffMerges first-parent && 526 + git log -p -m main >result && 527 process_diffs result >actual && 528 test_cmp expected actual 529 ' ··· 572 Third 573 Second 574 EOF 575 + git rev-list main | git diff-tree --stdin --format=%s -s >actual && 576 test_cmp expect actual 577 ' 578 ··· 585 586 dir/sub 587 EOF 588 + git rev-list main^ | 589 git diff-tree -r --stdin --name-only --format=%s dir >actual && 590 test_cmp expect actual 591 ' 592 593 test_expect_success 'show A B ... -- <pathspec>' ' 594 # side touches dir/sub, file0, and file3 595 + # main^ touches dir/sub, and file1 596 + # main^^ touches dir/sub, file0, and file2 597 + git show --name-only --format="<%s>" side main^ main^^ -- dir >actual && 598 cat >expect <<-\EOF && 599 <Side> 600 ··· 610 ' 611 612 test_expect_success 'diff -I<regex>: setup' ' 613 + git checkout main && 614 test_seq 50 >file0 && 615 git commit -m "Set up -I<regex> test file" file0 && 616 test_seq 50 | sed -e "s/13/ten and three/" -e "/7\$/d" >file0 &&

+1 -1

t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_main

··· 1 - $ git diff-tree --cc --patch-with-stat --summary master 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 dir/sub | 2 ++ 4 file0 | 3 +++

··· 1 + $ git diff-tree --cc --patch-with-stat --summary main 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 dir/sub | 2 ++ 4 file0 | 3 +++

+1 -1

t/t4013/diff.diff-tree_--cc_--patch-with-stat_master t/t4013/diff.diff-tree_--cc_--patch-with-stat_main

··· 1 - $ git diff-tree --cc --patch-with-stat master 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 dir/sub | 2 ++ 4 file0 | 3 +++

··· 1 + $ git diff-tree --cc --patch-with-stat main 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 dir/sub | 2 ++ 4 file0 | 3 +++

+1 -1

t/t4013/diff.diff-tree_--cc_--shortstat_master t/t4013/diff.diff-tree_--cc_--shortstat_main

··· 1 - $ git diff-tree --cc --shortstat master 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 2 files changed, 5 insertions(+) 4 $

··· 1 + $ git diff-tree --cc --shortstat main 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 2 files changed, 5 insertions(+) 4 $

+1 -1

t/t4013/diff.diff-tree_--cc_--stat_--summary_master t/t4013/diff.diff-tree_-c_--stat_--summary_main

··· 1 - $ git diff-tree --cc --stat --summary master 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 dir/sub | 2 ++ 4 file0 | 3 +++

··· 1 + $ git diff-tree -c --stat --summary main 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 dir/sub | 2 ++ 4 file0 | 3 +++

+1 -1

t/t4013/diff.diff-tree_--cc_--stat_master t/t4013/diff.diff-tree_--cc_--stat_main

··· 1 - $ git diff-tree --cc --stat master 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 dir/sub | 2 ++ 4 file0 | 3 +++

··· 1 + $ git diff-tree --cc --stat main 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 dir/sub | 2 ++ 4 file0 | 3 +++

+1 -1

t/t4013/diff.diff-tree_--cc_master t/t4013/diff.diff-tree_--cc_main

··· 1 - $ git diff-tree --cc master 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 diff --cc dir/sub 4 index cead32e,7289e35..992913c

··· 1 + $ git diff-tree --cc main 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 diff --cc dir/sub 4 index cead32e,7289e35..992913c

+1 -1

t/t4013/diff.diff-tree_-c_--abbrev_master t/t4013/diff.diff-tree_-c_--abbrev_main

··· 1 - $ git diff-tree -c --abbrev master 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 ::100644 100644 100644 cead32e... 7289e35... 992913c... MM dir/sub 4 ::100644 100644 100644 b414108... f4615da... 10a8a9f... MM file0

··· 1 + $ git diff-tree -c --abbrev main 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 ::100644 100644 100644 cead32e... 7289e35... 992913c... MM dir/sub 4 ::100644 100644 100644 b414108... f4615da... 10a8a9f... MM file0

+1 -1

t/t4013/diff.diff-tree_-c_--stat_--summary_master t/t4013/diff.diff-tree_--cc_--stat_--summary_main

··· 1 - $ git diff-tree -c --stat --summary master 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 dir/sub | 2 ++ 4 file0 | 3 +++

··· 1 + $ git diff-tree --cc --stat --summary main 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 dir/sub | 2 ++ 4 file0 | 3 +++

+1 -1

t/t4013/diff.diff-tree_-c_--stat_master t/t4013/diff.diff-tree_-c_--stat_main

··· 1 - $ git diff-tree -c --stat master 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 dir/sub | 2 ++ 4 file0 | 3 +++

··· 1 + $ git diff-tree -c --stat main 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 dir/sub | 2 ++ 4 file0 | 3 +++

+1 -1

t/t4013/diff.diff-tree_-c_master t/t4013/diff.diff-tree_-c_main

··· 1 - $ git diff-tree -c master 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 ::100644 100644 100644 cead32e925b1420c84c14cbf7cf755e7e45af8ad 7289e35bff32727c08dda207511bec138fdb9ea5 992913c5aa0a5476d10c49ed0f21fc0c6d1aedf3 MM dir/sub 4 ::100644 100644 100644 b414108e81e5091fe0974a1858b4d0d22b107f70 f4615da674c09df322d6ba8d6b21ecfb1b1ba510 10a8a9f3657f91a156b9f0184ed79a20adef9f7f MM file0

··· 1 + $ git diff-tree -c main 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 ::100644 100644 100644 cead32e925b1420c84c14cbf7cf755e7e45af8ad 7289e35bff32727c08dda207511bec138fdb9ea5 992913c5aa0a5476d10c49ed0f21fc0c6d1aedf3 MM dir/sub 4 ::100644 100644 100644 b414108e81e5091fe0974a1858b4d0d22b107f70 f4615da674c09df322d6ba8d6b21ecfb1b1ba510 10a8a9f3657f91a156b9f0184ed79a20adef9f7f MM file0

+1 -1

t/t4013/diff.diff-tree_-m_master t/t4013/diff.diff-tree_-m_main

··· 1 - $ git diff-tree -m master 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 :040000 040000 65f5c9dd60ce3b2b3324b618ac7accf8d912c113 0564e026437809817a64fff393079714b6dd4628 M dir 4 :100644 100644 b414108e81e5091fe0974a1858b4d0d22b107f70 10a8a9f3657f91a156b9f0184ed79a20adef9f7f M file0

··· 1 + $ git diff-tree -m main 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 :040000 040000 65f5c9dd60ce3b2b3324b618ac7accf8d912c113 0564e026437809817a64fff393079714b6dd4628 M dir 4 :100644 100644 b414108e81e5091fe0974a1858b4d0d22b107f70 10a8a9f3657f91a156b9f0184ed79a20adef9f7f M file0

+1 -1

t/t4013/diff.diff-tree_-p_-m_master t/t4013/diff.diff-tree_-p_-m_main

··· 1 - $ git diff-tree -p -m master 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 diff --git a/dir/sub b/dir/sub 4 index cead32e..992913c 100644

··· 1 + $ git diff-tree -p -m main 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 diff --git a/dir/sub b/dir/sub 4 index cead32e..992913c 100644

+2

t/t4013/diff.diff-tree_-p_main

··· 0 0

··· 1 + $ git diff-tree -p main 2 + $

-2

t/t4013/diff.diff-tree_-p_master

··· 1 - $ git diff-tree -p master 2 - $

··· 0 0

+2

t/t4013/diff.diff-tree_main

··· 0 0

··· 1 + $ git diff-tree main 2 + $

-2

t/t4013/diff.diff-tree_master

··· 1 - $ git diff-tree master 2 - $

··· 0 0

+3

t/t4013/diff.diff_--dirstat_--cc_main~1_main

··· 0 0 0

··· 1 + $ git diff --dirstat --cc main~1 main 2 + 40.0% dir/ 3 + $

-3

t/t4013/diff.diff_--dirstat_--cc_master~1_master

··· 1 - $ git diff --dirstat --cc master~1 master 2 - 40.0% dir/ 3 - $

··· 0 0 0

+3

t/t4013/diff.diff_--dirstat_main~1_main~2

··· 0 0 0

··· 1 + $ git diff --dirstat main~1 main~2 2 + 40.0% dir/ 3 + $

-3

t/t4013/diff.diff_--dirstat_master~1_master~2

··· 1 - $ git diff --dirstat master~1 master~2 2 - 40.0% dir/ 3 - $

··· 0 0 0

+1 -1

t/t4013/diff.diff_--line-prefix=abc_master_master^_side t/t4013/diff.diff_--line-prefix=abc_main_main^_side

··· 1 - $ git diff --line-prefix=abc master master^ side 2 abcdiff --cc dir/sub 3 abcindex cead32e,7289e35..992913c 4 abc--- a/dir/sub

··· 1 + $ git diff --line-prefix=abc main main^ side 2 abcdiff --cc dir/sub 3 abcindex cead32e,7289e35..992913c 4 abc--- a/dir/sub

+1 -1

t/t4013/diff.diff_master_master^_side t/t4013/diff.diff_main_main^_side

··· 1 - $ git diff master master^ side 2 diff --cc dir/sub 3 index cead32e,7289e35..992913c 4 --- a/dir/sub

··· 1 + $ git diff main main^ side 2 diff --cc dir/sub 3 index cead32e,7289e35..992913c 4 --- a/dir/sub

+1 -1

t/t4013/diff.format-patch_--attach_--stdout_initial..master t/t4013/diff.format-patch_--attach_--stdout_initial..main

··· 1 - $ git format-patch --attach --stdout initial..master 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

··· 1 + $ git format-patch --attach --stdout initial..main 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

+1 -1

t/t4013/diff.format-patch_--attach_--stdout_initial..master^ t/t4013/diff.format-patch_--attach_--stdout_initial..main^

··· 1 - $ git format-patch --attach --stdout initial..master^ 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

··· 1 + $ git format-patch --attach --stdout initial..main^ 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

+1 -1

t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..main

··· 1 - $ git format-patch --inline --stdout --numbered-files initial..master 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

··· 1 + $ git format-patch --inline --stdout --numbered-files initial..main 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

+1 -1

t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..main

··· 1 - $ git format-patch --inline --stdout --subject-prefix=TESTCASE initial..master 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

··· 1 + $ git format-patch --inline --stdout --subject-prefix=TESTCASE initial..main 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

+1 -1

t/t4013/diff.format-patch_--inline_--stdout_initial..master t/t4013/diff.format-patch_--inline_--stdout_initial..main

··· 1 - $ git format-patch --inline --stdout initial..master 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

··· 1 + $ git format-patch --inline --stdout initial..main 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

+1 -1

t/t4013/diff.format-patch_--inline_--stdout_initial..master^ t/t4013/diff.format-patch_--inline_--stdout_initial..main^

··· 1 - $ git format-patch --inline --stdout initial..master^ 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

··· 1 + $ git format-patch --inline --stdout initial..main^ 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

+1 -1

t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ t/t4013/diff.format-patch_--inline_--stdout_initial..main^^

··· 1 - $ git format-patch --inline --stdout initial..master^^ 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

··· 1 + $ git format-patch --inline --stdout initial..main^^ 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

+1 -1

t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^ t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..main^

··· 1 - $ git format-patch --stdout --cover-letter -n initial..master^ 2 From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001 3 From: C O Mitter <committer@example.com> 4 Date: Mon, 26 Jun 2006 00:06:00 +0000

··· 1 + $ git format-patch --stdout --cover-letter -n initial..main^ 2 From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001 3 From: C O Mitter <committer@example.com> 4 Date: Mon, 26 Jun 2006 00:06:00 +0000

+1 -1

t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master t/t4013/diff.format-patch_--stdout_--no-numbered_initial..main

··· 1 - $ git format-patch --stdout --no-numbered initial..master 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

··· 1 + $ git format-patch --stdout --no-numbered initial..main 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

+1 -1

t/t4013/diff.format-patch_--stdout_--numbered_initial..master t/t4013/diff.format-patch_--stdout_--numbered_initial..main

··· 1 - $ git format-patch --stdout --numbered initial..master 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

··· 1 + $ git format-patch --stdout --numbered initial..main 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

+1 -1

t/t4013/diff.format-patch_--stdout_initial..master t/t4013/diff.format-patch_--stdout_initial..main

··· 1 - $ git format-patch --stdout initial..master 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

··· 1 + $ git format-patch --stdout initial..main 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

+1 -1

t/t4013/diff.format-patch_--stdout_initial..master^ t/t4013/diff.format-patch_--stdout_initial..main^

··· 1 - $ git format-patch --stdout initial..master^ 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

··· 1 + $ git format-patch --stdout initial..main^ 2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 3 From: A U Thor <author@example.com> 4 Date: Mon, 26 Jun 2006 00:01:00 +0000

+1 -1

t/t4013/diff.log_--cc_-m_-p_master t/t4013/diff.log_-c_-m_-p_main

··· 1 - $ git log --cc -m -p master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log -c -m -p main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_--decorate=full_--all

··· 26 27 Notes added by 'git notes add' 28 29 - commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> refs/heads/master) 30 Merge: 9a6d494 c7a2ab9 31 Author: A U Thor <author@example.com> 32 Date: Mon Jun 26 00:04:00 2006 +0000

··· 26 27 Notes added by 'git notes add' 28 29 + commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> refs/heads/main) 30 Merge: 9a6d494 c7a2ab9 31 Author: A U Thor <author@example.com> 32 Date: Mon Jun 26 00:04:00 2006 +0000

+1 -1

t/t4013/diff.log_--decorate=full_--clear-decorations_--all

··· 26 27 Notes added by 'git notes add' 28 29 - commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> refs/heads/master) 30 Merge: 9a6d494 c7a2ab9 31 Author: A U Thor <author@example.com> 32 Date: Mon Jun 26 00:04:00 2006 +0000

··· 26 27 Notes added by 'git notes add' 28 29 + commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> refs/heads/main) 30 Merge: 9a6d494 c7a2ab9 31 Author: A U Thor <author@example.com> 32 Date: Mon Jun 26 00:04:00 2006 +0000

+1 -1

t/t4013/diff.log_--decorate=full_--decorate-all_--all

··· 26 27 Notes added by 'git notes add' 28 29 - commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> refs/heads/master) 30 Merge: 9a6d494 c7a2ab9 31 Author: A U Thor <author@example.com> 32 Date: Mon Jun 26 00:04:00 2006 +0000

··· 26 27 Notes added by 'git notes add' 28 29 + commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> refs/heads/main) 30 Merge: 9a6d494 c7a2ab9 31 Author: A U Thor <author@example.com> 32 Date: Mon Jun 26 00:04:00 2006 +0000

+1 -1

t/t4013/diff.log_--decorate_--all

··· 26 27 Notes added by 'git notes add' 28 29 - commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> master) 30 Merge: 9a6d494 c7a2ab9 31 Author: A U Thor <author@example.com> 32 Date: Mon Jun 26 00:04:00 2006 +0000

··· 26 27 Notes added by 'git notes add' 28 29 + commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> main) 30 Merge: 9a6d494 c7a2ab9 31 Author: A U Thor <author@example.com> 32 Date: Mon Jun 26 00:04:00 2006 +0000

+1 -1

t/t4013/diff.log_--decorate_--clear-decorations_--all

··· 26 27 Notes added by 'git notes add' 28 29 - commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> master) 30 Merge: 9a6d494 c7a2ab9 31 Author: A U Thor <author@example.com> 32 Date: Mon Jun 26 00:04:00 2006 +0000

··· 26 27 Notes added by 'git notes add' 28 29 + commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> main) 30 Merge: 9a6d494 c7a2ab9 31 Author: A U Thor <author@example.com> 32 Date: Mon Jun 26 00:04:00 2006 +0000

+1 -1

t/t4013/diff.log_--decorate_--decorate-all_--all

··· 26 27 Notes added by 'git notes add' 28 29 - commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> master) 30 Merge: 9a6d494 c7a2ab9 31 Author: A U Thor <author@example.com> 32 Date: Mon Jun 26 00:04:00 2006 +0000

··· 26 27 Notes added by 'git notes add' 28 29 + commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> main) 30 Merge: 9a6d494 c7a2ab9 31 Author: A U Thor <author@example.com> 32 Date: Mon Jun 26 00:04:00 2006 +0000

+1 -1

t/t4013/diff.log_--diff-merges=first-parent_master t/t4013/diff.log_--diff-merges=first-parent_main

··· 1 - $ git log --diff-merges=first-parent master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log --diff-merges=first-parent main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master t/t4013/diff.log_--no-diff-merges_-p_--first-parent_main

··· 1 - $ git log --diff-merges=off -p --first-parent master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log --no-diff-merges -p --first-parent main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master t/t4013/diff.log_--first-parent_--diff-merges=off_-p_main

··· 1 - $ git log --first-parent --diff-merges=off -p master 2 commit 80e25ffa65bcdbe82ef654b4d06dbbde7945c37f 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log --first-parent --diff-merges=off -p main 2 commit 80e25ffa65bcdbe82ef654b4d06dbbde7945c37f 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master t/t4013/diff.log_--diff-merges=off_-p_--first-parent_main

··· 1 - $ git log --no-diff-merges -p --first-parent master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log --diff-merges=off -p --first-parent main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_ t/t4013/diff.log_--patch-with-stat_--summary_main_--_dir_

··· 1 - $ git log --patch-with-stat --summary master -- dir/ 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log --patch-with-stat --summary main -- dir/ 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_--patch-with-stat_master t/t4013/diff.log_--patch-with-stat_main

··· 1 - $ git log --patch-with-stat master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log --patch-with-stat main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_--patch-with-stat_master_--_dir_ t/t4013/diff.log_--patch-with-stat_main_--_dir_

··· 1 - $ git log --patch-with-stat master -- dir/ 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log --patch-with-stat main -- dir/ 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_main

··· 1 - $ git log --root --cc --patch-with-stat --summary master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git whatchanged --root --cc --patch-with-stat --summary main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_--root_--patch-with-stat_--summary_master t/t4013/diff.log_--root_--patch-with-stat_--summary_main

··· 1 - $ git log --root --patch-with-stat --summary master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log --root --patch-with-stat --summary main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_--root_--patch-with-stat_master t/t4013/diff.log_--root_--patch-with-stat_main

··· 1 - $ git log --root --patch-with-stat master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log --root --patch-with-stat main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_main

··· 1 - $ git log --root -c --patch-with-stat --summary master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log --root -c --patch-with-stat --summary main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_--root_-p_master t/t4013/diff.log_--root_-p_main

··· 1 - $ git log --root -p master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log --root -p main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_--root_master t/t4013/diff.log_--root_main

··· 1 - $ git log --root master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log --root main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_-GF_-p_--pickaxe-all_master t/t4013/diff.log_-GF_-p_--pickaxe-all_main

··· 1 - $ git log -GF -p --pickaxe-all master 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

··· 1 + $ git log -GF -p --pickaxe-all main 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

+1 -1

t/t4013/diff.log_-GF_-p_master t/t4013/diff.log_-GF_-p_main

··· 1 - $ git log -GF -p master 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

··· 1 + $ git log -GF -p main 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

+1 -1

t/t4013/diff.log_-GF_master t/t4013/diff.log_-SF_main

··· 1 - $ git log -GF master 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

··· 1 + $ git log -SF main 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

+1 -1

t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_master t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_main

··· 1 - $ git log -IA -IB -I1 -I2 -p master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log -IA -IB -I1 -I2 -p main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_-SF_-p_master t/t4013/diff.log_-SF_-p_main

··· 1 - $ git log -SF -p master 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

··· 1 + $ git log -SF -p main 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

+2

t/t4013/diff.log_-SF_main_--max-count=0

··· 0 0

··· 1 + $ git log -SF main --max-count=0 2 + $

+1 -1

t/t4013/diff.log_-SF_master t/t4013/diff.log_-S_F_main

··· 1 - $ git log -SF master 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

··· 1 + $ git log -S F main 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

-2

t/t4013/diff.log_-SF_master_--max-count=0

··· 1 - $ git log -SF master --max-count=0 2 - $

··· 0 0

+1 -1

t/t4013/diff.log_-SF_master_--max-count=1 t/t4013/diff.log_-SF_main_--max-count=2

··· 1 - $ git log -SF master --max-count=1 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

··· 1 + $ git log -SF main --max-count=2 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

+1 -1

t/t4013/diff.log_-SF_master_--max-count=2 t/t4013/diff.log_-SF_main_--max-count=1

··· 1 - $ git log -SF master --max-count=2 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

··· 1 + $ git log -SF main --max-count=1 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

+1 -1

t/t4013/diff.log_-S_F_master t/t4013/diff.log_-GF_main

··· 1 - $ git log -S F master 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

··· 1 + $ git log -GF main 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

+1 -1

t/t4013/diff.log_-c_-m_-p_master t/t4013/diff.log_-m_-p_main

··· 1 - $ git log -c -m -p master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log -m -p main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_-m_--raw_master t/t4013/diff.log_-m_--raw_main

··· 1 - $ git log -m --raw master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log -m --raw main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_-m_--stat_master t/t4013/diff.log_-m_--stat_main

··· 1 - $ git log -m --stat master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log -m --stat main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_-m_-p_--first-parent_master t/t4013/diff.log_-p_--first-parent_main

··· 1 - $ git log -m -p --first-parent master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log -p --first-parent main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_-m_-p_master t/t4013/diff.log_--cc_-m_-p_main

··· 1 - $ git log -m -p master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log --cc -m -p main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_-p_--diff-merges=first-parent_master t/t4013/diff.log_-p_--diff-merges=first-parent_main

··· 1 - $ git log -p --diff-merges=first-parent master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log -p --diff-merges=first-parent main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_-p_--first-parent_master t/t4013/diff.log_-m_-p_--first-parent_main

··· 1 - $ git log -p --first-parent master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log -m -p --first-parent main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_-p_master t/t4013/diff.log_-p_main

··· 1 - $ git log -p master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log -p main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.log_master t/t4013/diff.log_main

··· 1 - $ git log master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.noellipses-diff-tree_-c_--abbrev_master t/t4013/diff.noellipses-diff-tree_-c_--abbrev_main

··· 1 - $ git diff-tree -c --abbrev master 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 ::100644 100644 100644 cead32e 7289e35 992913c MM dir/sub 4 ::100644 100644 100644 b414108 f4615da 10a8a9f MM file0

··· 1 + $ git diff-tree -c --abbrev main 2 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 ::100644 100644 100644 cead32e 7289e35 992913c MM dir/sub 4 ::100644 100644 100644 b414108 f4615da 10a8a9f MM file0

+1 -1

t/t4013/diff.noellipses-whatchanged_--root_master t/t4013/diff.noellipses-whatchanged_--root_main

··· 1 - $ git whatchanged --root master 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

··· 1 + $ git whatchanged --root main 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

+1 -1

t/t4013/diff.noellipses-whatchanged_-SF_master t/t4013/diff.noellipses-whatchanged_-SF_main

··· 1 - $ git whatchanged -SF master 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

··· 1 + $ git whatchanged -SF main 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

+1 -1

t/t4013/diff.noellipses-whatchanged_master t/t4013/diff.noellipses-whatchanged_main

··· 1 - $ git whatchanged master 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

··· 1 + $ git whatchanged main 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

+1 -1

t/t4013/diff.show_--first-parent_master t/t4013/diff.show_--first-parent_main

··· 1 - $ git show --first-parent master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git show --first-parent main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.show_-c_master t/t4013/diff.show_-c_main

··· 1 - $ git show -c master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git show -c main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.show_-m_master t/t4013/diff.show_-m_main

··· 1 - $ git show -m master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git show -m main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.show_master t/t4013/diff.show_main

··· 1 - $ git show master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git show main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_ t/t4013/diff.whatchanged_--patch-with-stat_--summary_main_--_dir_

··· 1 - $ git whatchanged --patch-with-stat --summary master -- dir/ 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

··· 1 + $ git whatchanged --patch-with-stat --summary main -- dir/ 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

+1 -1

t/t4013/diff.whatchanged_--patch-with-stat_master t/t4013/diff.whatchanged_--patch-with-stat_main

··· 1 - $ git whatchanged --patch-with-stat master 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

··· 1 + $ git whatchanged --patch-with-stat main 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

+1 -1

t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_ t/t4013/diff.whatchanged_--patch-with-stat_main_--_dir_

··· 1 - $ git whatchanged --patch-with-stat master -- dir/ 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

··· 1 + $ git whatchanged --patch-with-stat main -- dir/ 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

+1 -1

t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_main

··· 1 - $ git whatchanged --root --cc --patch-with-stat --summary master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git log --root --cc --patch-with-stat --summary main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_main

··· 1 - $ git whatchanged --root --patch-with-stat --summary master 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

··· 1 + $ git whatchanged --root --patch-with-stat --summary main 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

+1 -1

t/t4013/diff.whatchanged_--root_--patch-with-stat_master t/t4013/diff.whatchanged_--root_--patch-with-stat_main

··· 1 - $ git whatchanged --root --patch-with-stat master 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

··· 1 + $ git whatchanged --root --patch-with-stat main 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

+1 -1

t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_main

··· 1 - $ git whatchanged --root -c --patch-with-stat --summary master 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

··· 1 + $ git whatchanged --root -c --patch-with-stat --summary main 2 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 Merge: 9a6d494 c7a2ab9 4 Author: A U Thor <author@example.com>

+1 -1

t/t4013/diff.whatchanged_--root_-p_master t/t4013/diff.whatchanged_--root_-p_main

··· 1 - $ git whatchanged --root -p master 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

··· 1 + $ git whatchanged --root -p main 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

+1 -1

t/t4013/diff.whatchanged_--root_master t/t4013/diff.whatchanged_--root_main

··· 1 - $ git whatchanged --root master 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

··· 1 + $ git whatchanged --root main 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

+1 -1

t/t4013/diff.whatchanged_-SF_-p_master t/t4013/diff.whatchanged_-SF_-p_main

··· 1 - $ git whatchanged -SF -p master 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

··· 1 + $ git whatchanged -SF -p main 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

+1 -1

t/t4013/diff.whatchanged_-SF_master t/t4013/diff.whatchanged_-SF_main

··· 1 - $ git whatchanged -SF master 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

··· 1 + $ git whatchanged -SF main 2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:02:00 2006 +0000

+1 -1

t/t4013/diff.whatchanged_-p_master t/t4013/diff.whatchanged_-p_main

··· 1 - $ git whatchanged -p master 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

··· 1 + $ git whatchanged -p main 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

+1 -1

t/t4013/diff.whatchanged_master t/t4013/diff.whatchanged_main

··· 1 - $ git whatchanged master 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000

··· 1 + $ git whatchanged main 2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 Author: A U Thor <author@example.com> 4 Date: Mon Jun 26 00:03:00 2006 +0000