summaryrefslogtreecommitdiff
path: root/t/t4015-diff-whitespace.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-12-191-0/+17
|\
| * diff-tree: read the index so attribute checks work in bare repositoriesbw/submodule-config-cleanupBrandon Williams2017-12-061-0/+17
* | Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano2017-11-271-0/+28
|\ \
| * | diff: --ignore-cr-at-eoljc/ignore-cr-at-eolJunio C Hamano2017-11-081-0/+28
| |/
* | diff: fix whitespace-skipping with --color-movedJeff King2017-10-211-0/+67
* | t4015: test the output of "diff --color-moved -b"Jeff King2017-10-211-9/+64
* | t4015: check "negative" case for "-w --color-moved"Jeff King2017-10-211-8/+18
* | t4015: refactor --color-moved whitespace testJeff King2017-10-211-20/+29
* | Merge branch 'sb/diff-color-move'Junio C Hamano2017-10-171-0/+9
|\ \
| * | diff: fix infinite loop with --color-moved --ignore-space-changesb/diff-color-moveJeff King2017-10-161-0/+9
* | | Merge branch 'sb/test-cmp-expect-actual'Junio C Hamano2017-10-111-2/+2
|\ \ \
| * | | tests: fix diff order arguments in test_cmpsb/test-cmp-expect-actualStefan Beller2017-10-071-2/+2
* | | | Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-autojk/ui-color-always-to-autoJunio C Hamano2017-10-041-14/+14
|\ \ \ \
| * | | | t4015: prefer --color to -c color.diff=alwaysJeff King2017-10-041-14/+14
| | |_|/ | |/| |
* | | | t4015: use --color with --color-movedJeff King2017-10-041-13/+12
| |/ / |/| |
* | | diff: define block by number of alphanumeric charsjt/diff-color-move-fixJonathan Tan2017-08-161-69/+157
* | | diff: respect MIN_BLOCK_LENGTH for last blockJonathan Tan2017-08-161-0/+37
| |/ |/|
* | diff.c: add dimming to moved line detectionStefan Beller2017-06-301-0/+124
* | diff.c: color moved lines differently, plain modeStefan Beller2017-06-301-1/+50
* | diff.c: color moved lines differentlyStefan Beller2017-06-301-0/+261
|/
* diff: introduce diff.wsErrorHighlight optionjc/ws-error-highlightJunio C Hamano2016-10-041-0/+35
* t4015: split out the "setup" part of ws-error-highlight testJunio C Hamano2016-10-041-18/+21
* diff.c: --ws-error-highlight=<kind> optionJunio C Hamano2015-05-261-0/+96
* t4015: separate common setup and per-test expectationJunio C Hamano2015-05-261-12/+13
* t4015: modernise styleJunio C Hamano2015-05-261-238/+173
* t4015: simplify sed command that is not even seen by sedbw/solaris-sed-tr-test-portabilityJunio C Hamano2013-11-041-1/+0
* Change sed i\ usage to something Solaris' sed can handleBen Walton2013-10-281-2/+4
* diff: add --ignore-blank-lines optionAntoine Pelisse2013-06-191-0/+345
* xdiff: print post-image for common records instead of pre-imagers/diff-postimage-in-contextRené Scharfe2012-01-061-7/+7
* Make the tab width used for whitespace checks configurableJohannes Sixt2010-12-011-0/+28
* Merge branch 'en/and-cascade-tests'Junio C Hamano2010-11-241-1/+1
|\
| * tests: add missing &&Jonathan Nieder2010-11-091-1/+1
* | diff: handle lines containing only whitespace and tabs betterKevin Ballard2010-10-201-0/+37
|/
* Merge branch 'cc/maint-diff-CC-binary'Junio C Hamano2010-06-181-0/+37
|\
| * diff: fix "git show -C -C" output when renaming a binary fileChristian Couder2010-06-061-0/+37
* | whitespace: tests for git-diff --check with tab-in-indent error classChris Webb2010-04-041-0/+42
|/
* No diff -b/-w output for all-whitespace changesGreg Bacon2009-11-201-2/+12
* Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano2009-09-151-2/+9
|\
| * diff --whitespace=warn/error: fix blank-at-eof checkJunio C Hamano2009-09-041-0/+7
| * diff --whitespace=warn/error: obey blank-at-eofJunio C Hamano2009-09-041-2/+2
* | Merge branch 'kc/maint-diff-bwi-fix'Junio C Hamano2009-01-211-4/+4
|\ \
| * | Fix combined use of whitespace ignore options to diffKeith Cascio2009-01-191-4/+4
| * | test more combinations of ignore-whitespace options to diffKeith Cascio2009-01-191-0/+27
| |/
* | test more combinations of ignore-whitespace options to diffKeith Cascio2009-01-171-0/+27
* | Merge branch 'maint' to sync with 1.6.0.1Junio C Hamano2008-08-241-0/+16
|\ \ | |/
| * Respect core.autocrlf in combined diffAlexander Gavrilov2008-08-231-0/+16
* | Merge branch 'jc/test-deeper'Junio C Hamano2008-08-201-1/+1
|\ \ | |/ |/|
| * tests: use $TEST_DIRECTORY to refer to the t/ directoryJunio C Hamano2008-08-171-1/+1
* | diff --check: do not get confused by new blank lines in the middleJunio C Hamano2008-08-201-0/+11
|/
* t/: Use "test_must_fail git" instead of "! git"Stephan Beyer2008-07-131-14/+14