summaryrefslogtreecommitdiff
path: root/t/t4020-diff-external.sh
AgeCommit message (Expand)AuthorFilesLines
2014-03-14Merge branch 'tr/diff-submodule-no-reuse-worktree'Libravatar Junio C Hamano1-1/+29
2014-02-18diff: do not reuse_worktree_file for submodulesLibravatar Thomas Rast1-1/+29
2013-12-06difftool: display the number of files in the diff queue in the promptLibravatar Zoltan Klinger1-0/+13
2013-10-29t: use perl instead of "$PERL_PATH" where applicableLibravatar Jeff King1-1/+1
2012-07-23Merge branch 'jv/maint-no-ext-diff'Libravatar Junio C Hamano1-0/+59
2012-07-19diff: test precedence of external diff driversLibravatar Jeff King1-0/+40
2012-07-17diff: correctly disable external_diff with --no-ext-diffLibravatar Junio C Hamano1-0/+19
2012-06-24tests: enclose $PERL_PATH in double quotesLibravatar Junio C Hamano1-1/+1
2012-06-12t: Replace 'perl' by $PERL_PATHLibravatar Vincent van Ravesteijn1-1/+1
2011-04-23test: use $_z40 from test-libLibravatar Junio C Hamano1-2/+0
2009-08-09tests: use "$TEST_DIRECTORY" instead of ".."Libravatar Jeff King1-1/+1
2009-05-31diff: generate pretty filenames in prep_temp_blob()Libravatar David Aguilar1-0/+9
2009-03-28Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'Libravatar Junio C Hamano1-0/+8
2009-03-22diff --cached: do not borrow from a work tree when a path is marked as assume...Libravatar Junio C Hamano1-0/+8
2009-03-22Smudge the files fed to external diff and textconvLibravatar Johannes Schindelin1-0/+16
2009-02-12Bugfix: GIT_EXTERNAL_DIFF with more than one changed filesLibravatar Nazri Ramliy1-0/+8
2008-11-26Merge branch 'maint'Libravatar Junio C Hamano1-0/+21
2008-11-26Teach "git diff" to honour --[no-]ext-diffLibravatar Junio C Hamano1-0/+21
2008-08-17tests: use $TEST_DIRECTORY to refer to the t/ directoryLibravatar Junio C Hamano1-1/+1
2008-03-13t4020: don't use grep -aLibravatar Jeff King1-1/+2
2008-03-13more tr portability test script fixesLibravatar Jeff King1-1/+1
2007-12-17the use of 'tr' in the test suite isn't really portableLibravatar H.Merijn Brand1-1/+1
2007-07-07diff: honor binariness specified in attributesLibravatar Junio C Hamano1-0/+12
2007-04-22Support 'diff=pgm' attributeLibravatar Junio C Hamano1-0/+97