summaryrefslogtreecommitdiff
path: root/t/t4013-diff-various.sh
AgeCommit message (Expand)AuthorFilesLines
2021-12-13tests: use test_write_lines() to generate line-oriented outputLibravatar Eric Sunshine1-11/+11
2021-08-30Merge branch 'en/pull-conflicting-options'Libravatar Junio C Hamano1-1/+1
2021-08-09Revert 'diff-merges: let "-m" imply "-p"'Libravatar Jonathan Nieder1-2/+2
2021-07-22pull: abort by default when fast-forwarding is not possibleLibravatar Elijah Newren1-1/+1
2021-05-21diff-merges: let "-m" imply "-p"Libravatar Sergey Organov1-2/+2
2021-05-21t4013: test "git diff-index -m"Libravatar Sergey Organov1-0/+13
2021-05-21t4013: test "git diff-tree -m"Libravatar Sergey Organov1-0/+1
2021-05-21t4013: test "git log -m --stat"Libravatar Sergey Organov1-0/+1
2021-05-21t4013: test "git log -m --raw"Libravatar Sergey Organov1-0/+1
2021-05-21t4013: test that "-m" alone has no effect in "git log"Libravatar Sergey Organov1-0/+8
2021-04-16diff-merges: introduce log.diffMerges config variableLibravatar Sergey Organov1-0/+23
2021-04-16diff-merges: introduce --diff-merges=onLibravatar Sergey Organov1-0/+8
2021-02-25Merge branch 'ab/detox-gettext-tests'Libravatar Junio C Hamano1-1/+1
2021-02-12test libs: rename "diff-lib" to "lib-diff"Libravatar Ævar Arnfjörð Bjarmason1-1/+1
2021-02-10tests: remove most uses of test_i18ncmpLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2021-02-05Merge branch 'so/log-diff-merge'Libravatar Junio C Hamano1-1/+10
2020-12-21t4013: add tests for --diff-merges=first-parentLibravatar Sergey Organov1-0/+2
2020-12-21diff-merges: fix -m to properly override -c/--ccLibravatar Sergey Organov1-2/+2
2020-12-21t4013: add tests for -m failing to override -c/--ccLibravatar Sergey Organov1-0/+2
2020-12-21t4013: support test_expect_failure through ':failure' magicLibravatar Sergey Organov1-1/+6
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Libravatar Johannes Schindelin1-0/+3
2020-11-02Merge branch 'mk/diff-ignore-regex'Libravatar Junio C Hamano1-0/+41
2020-10-20diff: add -I<regex> that ignores matching changesLibravatar Michał Kępień1-0/+41
2020-08-31Merge branch 'dd/diff-customize-index-line-abbrev'Libravatar Junio C Hamano1-21/+42
2020-08-21diff: index-line: respect --abbrev in object's nameLibravatar Đoàn Trần Công Danh1-0/+3
2020-08-21t4013: improve diff-post-processor logicLibravatar brian m. carlson1-21/+39
2020-08-17Merge branch 'so/log-diff-merges-opt'Libravatar Junio C Hamano1-0/+2
2020-08-17Merge branch 'jk/log-fp-implies-m'Libravatar Junio C Hamano1-0/+1
2020-08-11t/t4013: add test for --diff-merges=offLibravatar Sergey Organov1-0/+2
2020-07-30Revert "fmt-merge-msg: stop treating `master` specially"Libravatar Junio C Hamano1-2/+2
2020-07-29revision: add "--no-diff-merges" option to counteract "-m"Libravatar Jeff King1-0/+1
2020-06-23fmt-merge-msg: stop treating `master` speciallyLibravatar Johannes Schindelin1-2/+2
2020-04-28Merge branch 'tb/diff-tree-with-notes'Libravatar Junio C Hamano1-0/+12
2020-04-20diff-tree.c: load notes machinery when requiredLibravatar Taylor Blau1-0/+12
2020-02-07t4013: make test hash independentLibravatar brian m. carlson1-6/+38
2019-09-05t: use LF variable defined in the test harnessLibravatar Junio C Hamano1-3/+0
2019-05-30Merge branch 'nd/diff-parseopt'Libravatar Junio C Hamano1-0/+2
2019-05-29diff-parseopt: restore -U (no argument) behaviorLibravatar Nguyễn Thái Ngọc Duy1-0/+2
2019-01-24combine-diff: treat --dirstat like --statLibravatar Jeff King1-0/+1
2019-01-24combine-diff: treat --summary like --statLibravatar Jeff King1-0/+7
2019-01-24combine-diff: treat --shortstat like --statLibravatar Jeff King1-0/+1
2018-11-20tests: send "bug in the test script" errors to the script's stderrLibravatar SZEDER Gábor1-1/+1
2018-08-29tests: fix non-portable "${var:-"str"}" constructLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2018-03-27t/helper: merge test-chmtime into test-toolLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-02-27diff: add --compact-summaryLibravatar Nguyễn Thái Ngọc Duy1-0/+5
2017-12-06t4013: test new output from diff --abbrev --rawLibravatar Ann T Ropea1-1/+15
2017-12-06t4013: prepare for upcoming "diff --raw --abbrev" output format changeLibravatar Ann T Ropea1-6/+23
2017-12-04print_sha1_ellipsis: introduce helperLibravatar Ann T Ropea1-1/+1
2017-09-28diff: correct newline in summary for renamed filesLibravatar Stefan Beller1-0/+12
2016-12-08diff: handle --no-abbrev in no-index caseLibravatar Jack Bates1-0/+7