aboutsummaryrefslogtreecommitdiff
path: root/t/t4020-diff-external.sh
Commit message (Expand)AuthorAge
* Merge branch 'tr/diff-submodule-no-reuse-worktree'Junio C Hamano2014-03-14
|\
| * diff: do not reuse_worktree_file for submodulesThomas Rast2014-02-18
* | difftool: display the number of files in the diff queue in the promptZoltan Klinger2013-12-06
* | t: use perl instead of "$PERL_PATH" where applicableJeff King2013-10-29
|/
* Merge branch 'jv/maint-no-ext-diff'Junio C Hamano2012-07-23
|\
| * diff: test precedence of external diff driversJeff King2012-07-19
| * diff: correctly disable external_diff with --no-ext-diffJunio C Hamano2012-07-17
* | tests: enclose $PERL_PATH in double quotesJunio C Hamano2012-06-24
* | t: Replace 'perl' by $PERL_PATHVincent van Ravesteijn2012-06-12
|/
* test: use $_z40 from test-libJunio C Hamano2011-04-23
* tests: use "$TEST_DIRECTORY" instead of ".."Jeff King2009-08-09
* diff: generate pretty filenames in prep_temp_blob()David Aguilar2009-05-31
* Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'Junio C Hamano2009-03-28
|\
| * diff --cached: do not borrow from a work tree when a path is marked as assume...Junio C Hamano2009-03-22
* | Smudge the files fed to external diff and textconvJohannes Schindelin2009-03-22
* | Bugfix: GIT_EXTERNAL_DIFF with more than one changed filesNazri Ramliy2009-02-12
* | Merge branch 'maint'Junio C Hamano2008-11-26
|\ \
| * | Teach "git diff" to honour --[no-]ext-diffJunio C Hamano2008-11-26
| |/
* | tests: use $TEST_DIRECTORY to refer to the t/ directoryJunio C Hamano2008-08-17
|/
* t4020: don't use grep -aJeff King2008-03-13
* more tr portability test script fixesJeff King2008-03-13
* the use of 'tr' in the test suite isn't really portableH.Merijn Brand2007-12-17
* diff: honor binariness specified in attributesJunio C Hamano2007-07-07
* Support 'diff=pgm' attributeJunio C Hamano2007-04-22