summaryrefslogtreecommitdiff
path: root/t/t4013-diff-various.sh
Commit message (Expand)AuthorAgeFilesLines
* diff: add --default-prefix optionJeff King2023-03-091-0/+10
* t4013: add tests for diff prefix optionsJeff King2023-03-091-0/+32
* log: add --clear-decorations optionDerrick Stolee2022-08-051-0/+2
* Merge branch 'jc/show-pathspec-fix'Junio C Hamano2022-05-041-0/+19
|\
| * 2.36 show regression fixJunio C Hamano2022-04-291-0/+19
* | 2.36 gitk/diff-tree --stdin regression fixJunio C Hamano2022-04-261-0/+14
|/
* tests: use test_write_lines() to generate line-oriented outputEric Sunshine2021-12-131-11/+11
* Merge branch 'en/pull-conflicting-options'Junio C Hamano2021-08-301-1/+1
|\
| * pull: abort by default when fast-forwarding is not possibleElijah Newren2021-07-221-1/+1
* | Revert 'diff-merges: let "-m" imply "-p"'Jonathan Nieder2021-08-091-2/+2
|/
* diff-merges: let "-m" imply "-p"Sergey Organov2021-05-211-2/+2
* t4013: test "git diff-index -m"Sergey Organov2021-05-211-0/+13
* t4013: test "git diff-tree -m"Sergey Organov2021-05-211-0/+1
* t4013: test "git log -m --stat"Sergey Organov2021-05-211-0/+1
* t4013: test "git log -m --raw"Sergey Organov2021-05-211-0/+1
* t4013: test that "-m" alone has no effect in "git log"Sergey Organov2021-05-211-0/+8
* diff-merges: introduce log.diffMerges config variableSergey Organov2021-04-161-0/+23
* diff-merges: introduce --diff-merges=onSergey Organov2021-04-161-0/+8
* Merge branch 'ab/detox-gettext-tests'Junio C Hamano2021-02-251-1/+1
|\
| * tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason2021-02-101-1/+1
* | test libs: rename "diff-lib" to "lib-diff"Ævar Arnfjörð Bjarmason2021-02-121-1/+1
|/
* Merge branch 'so/log-diff-merge'Junio C Hamano2021-02-051-1/+10
|\
| * t4013: add tests for --diff-merges=first-parentSergey Organov2020-12-211-0/+2
| * diff-merges: fix -m to properly override -c/--ccSergey Organov2020-12-211-2/+2
| * t4013: add tests for -m failing to override -c/--ccSergey Organov2020-12-211-0/+2
| * t4013: support test_expect_failure through ':failure' magicSergey Organov2020-12-211-1/+6
* | tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
* | Merge branch 'mk/diff-ignore-regex'Junio C Hamano2020-11-021-0/+41
|\ \ | |/ |/|
| * diff: add -I<regex> that ignores matching changesMichał Kępień2020-10-201-0/+41
* | Merge branch 'dd/diff-customize-index-line-abbrev'Junio C Hamano2020-08-311-21/+42
|\ \
| * | diff: index-line: respect --abbrev in object's nameĐoàn Trần Công Danh2020-08-211-0/+3
| * | t4013: improve diff-post-processor logicbrian m. carlson2020-08-211-21/+39
* | | Merge branch 'so/log-diff-merges-opt'Junio C Hamano2020-08-171-0/+2
|\ \ \
| * | | t/t4013: add test for --diff-merges=offSergey Organov2020-08-111-0/+2
* | | | Merge branch 'jk/log-fp-implies-m'Junio C Hamano2020-08-171-0/+1
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | revision: add "--no-diff-merges" option to counteract "-m"Jeff King2020-07-291-0/+1
| |/
* | Revert "fmt-merge-msg: stop treating `master` specially"Junio C Hamano2020-07-301-2/+2
|/
* fmt-merge-msg: stop treating `master` speciallyJohannes Schindelin2020-06-231-2/+2
* Merge branch 'tb/diff-tree-with-notes'Junio C Hamano2020-04-281-0/+12
|\
| * diff-tree.c: load notes machinery when requiredTaylor Blau2020-04-201-0/+12
* | t4013: make test hash independentbrian m. carlson2020-02-071-6/+38
|/
* t: use LF variable defined in the test harnessJunio C Hamano2019-09-051-3/+0
* Merge branch 'nd/diff-parseopt'Junio C Hamano2019-05-301-0/+2
|\
| * diff-parseopt: restore -U (no argument) behaviorNguyễn Thái Ngọc Duy2019-05-291-0/+2
* | combine-diff: treat --dirstat like --statJeff King2019-01-241-0/+1
* | combine-diff: treat --summary like --statJeff King2019-01-241-0/+7
* | combine-diff: treat --shortstat like --statJeff King2019-01-241-0/+1
|/
* tests: send "bug in the test script" errors to the script's stderrSZEDER Gábor2018-11-201-1/+1
* tests: fix non-portable "${var:-"str"}" constructÆvar Arnfjörð Bjarmason2018-08-291-1/+1
* t/helper: merge test-chmtime into test-toolNguyễn Thái Ngọc Duy2018-03-271-1/+1
View Lorry Controller Status