summaryrefslogtreecommitdiff
path: root/t/t4020-diff-external.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tr/diff-submodule-no-reuse-worktree'Junio C Hamano2014-03-141-1/+29
|\
| * diff: do not reuse_worktree_file for submodulestr/diff-submodule-no-reuse-worktreeThomas Rast2014-02-181-1/+29
* | difftool: display the number of files in the diff queue in the promptZoltan Klinger2013-12-061-0/+13
* | t: use perl instead of "$PERL_PATH" where applicablejk/wrap-perl-used-in-testsJeff King2013-10-291-1/+1
|/
* Merge branch 'jv/maint-no-ext-diff'Junio C Hamano2012-07-231-0/+59
|\
| * diff: test precedence of external diff driversJeff King2012-07-191-0/+40
| * diff: correctly disable external_diff with --no-ext-diffJunio C Hamano2012-07-171-0/+19
* | tests: enclose $PERL_PATH in double quotesJunio C Hamano2012-06-241-1/+1
* | t: Replace 'perl' by $PERL_PATHVincent van Ravesteijn2012-06-121-1/+1
|/
* test: use $_z40 from test-libJunio C Hamano2011-04-231-2/+0
* tests: use "$TEST_DIRECTORY" instead of ".."Jeff King2009-08-091-1/+1
* diff: generate pretty filenames in prep_temp_blob()David Aguilar2009-05-311-0/+9
* Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'Junio C Hamano2009-03-281-0/+8
|\
| * diff --cached: do not borrow from a work tree when a path is marked as assume...Junio C Hamano2009-03-221-0/+8
* | Smudge the files fed to external diff and textconvJohannes Schindelin2009-03-221-0/+16
* | Bugfix: GIT_EXTERNAL_DIFF with more than one changed filesNazri Ramliy2009-02-121-0/+8
* | Merge branch 'maint'Junio C Hamano2008-11-261-0/+21
|\ \
| * | Teach "git diff" to honour --[no-]ext-diffJunio C Hamano2008-11-261-0/+21
| |/
* | tests: use $TEST_DIRECTORY to refer to the t/ directoryJunio C Hamano2008-08-171-1/+1
|/
* t4020: don't use grep -aJeff King2008-03-131-1/+2
* more tr portability test script fixesJeff King2008-03-131-1/+1
* the use of 'tr' in the test suite isn't really portableH.Merijn Brand2007-12-171-1/+1
* diff: honor binariness specified in attributesJunio C Hamano2007-07-071-0/+12
* Support 'diff=pgm' attributeJunio C Hamano2007-04-221-0/+97
View Lorry Controller Status