summaryrefslogtreecommitdiff
path: root/t/t4013-diff-various.sh
AgeCommit message (Expand)Author
2021-12-13tests: use test_write_lines() to generate line-oriented outputEric Sunshine
2021-08-30Merge branch 'en/pull-conflicting-options'Junio C Hamano
2021-08-09Revert 'diff-merges: let "-m" imply "-p"'Jonathan Nieder
2021-07-22pull: abort by default when fast-forwarding is not possibleElijah Newren
2021-05-21diff-merges: let "-m" imply "-p"Sergey Organov
2021-05-21t4013: test "git diff-index -m"Sergey Organov
2021-05-21t4013: test "git diff-tree -m"Sergey Organov
2021-05-21t4013: test "git log -m --stat"Sergey Organov
2021-05-21t4013: test "git log -m --raw"Sergey Organov
2021-05-21t4013: test that "-m" alone has no effect in "git log"Sergey Organov
2021-04-17diff-merges: introduce log.diffMerges config variableSergey Organov
2021-04-17diff-merges: introduce --diff-merges=onSergey Organov
2021-02-26Merge branch 'ab/detox-gettext-tests'Junio C Hamano
2021-02-12test libs: rename "diff-lib" to "lib-diff"Ævar Arnfjörð Bjarmason
2021-02-11tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason
2021-02-06Merge branch 'so/log-diff-merge'Junio C Hamano
2020-12-21t4013: add tests for --diff-merges=first-parentSergey Organov
2020-12-21diff-merges: fix -m to properly override -c/--ccSergey Organov
2020-12-21t4013: add tests for -m failing to override -c/--ccSergey Organov
2020-12-21t4013: support test_expect_failure through ':failure' magicSergey Organov
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2020-11-02Merge branch 'mk/diff-ignore-regex'Junio C Hamano
2020-10-20diff: add -I<regex> that ignores matching changesMichał Kępień
2020-08-31Merge branch 'dd/diff-customize-index-line-abbrev'Junio C Hamano
2020-08-21diff: index-line: respect --abbrev in object's nameĐoàn Trần Công Danh
2020-08-21t4013: improve diff-post-processor logicbrian m. carlson
2020-08-18Merge branch 'so/log-diff-merges-opt'Junio C Hamano
2020-08-18Merge branch 'jk/log-fp-implies-m'Junio C Hamano
2020-08-11t/t4013: add test for --diff-merges=offSergey Organov
2020-07-30Revert "fmt-merge-msg: stop treating `master` specially"Junio C Hamano
2020-07-29revision: add "--no-diff-merges" option to counteract "-m"Jeff King
2020-06-24fmt-merge-msg: stop treating `master` speciallyJohannes Schindelin
2020-04-28Merge branch 'tb/diff-tree-with-notes'Junio C Hamano
2020-04-21diff-tree.c: load notes machinery when requiredTaylor Blau
2020-02-07t4013: make test hash independentbrian m. carlson
2019-09-05t: use LF variable defined in the test harnessJunio C Hamano
2019-05-30Merge branch 'nd/diff-parseopt'Junio C Hamano
2019-05-29diff-parseopt: restore -U (no argument) behaviorNguyễn Thái Ngọc Duy
2019-01-24combine-diff: treat --dirstat like --statJeff King
2019-01-24combine-diff: treat --summary like --statJeff King
2019-01-24combine-diff: treat --shortstat like --statJeff King
2018-11-20tests: send "bug in the test script" errors to the script's stderrSZEDER Gábor
2018-08-29tests: fix non-portable "${var:-"str"}" constructÆvar Arnfjörð Bjarmason
2018-03-27t/helper: merge test-chmtime into test-toolNguyễn Thái Ngọc Duy
2018-02-27diff: add --compact-summaryNguyễn Thái Ngọc Duy
2017-12-06t4013: test new output from diff --abbrev --rawAnn T Ropea
2017-12-06t4013: prepare for upcoming "diff --raw --abbrev" output format changeAnn T Ropea
2017-12-04print_sha1_ellipsis: introduce helperAnn T Ropea
2017-09-28diff: correct newline in summary for renamed filesStefan Beller
2016-12-08diff: handle --no-abbrev in no-index caseJack Bates