summaryrefslogtreecommitdiff
path: root/t/t7800-difftool.sh
Commit message (Expand)AuthorAgeFilesLines
* run_external_diff: clean up error handlingJeff King2014-04-211-1/+1
* t7800: add a difftool test for .git-filesda/difftool-git-filesJunio C Hamano2014-03-051-0/+14
* difftool --dir-diff: allow changing any clean working tree fileKenichi Saita2013-05-291-0/+19
* difftool: fix dir-diff when file does not exist in working treeJohn Keeping2013-05-171-0/+7
* t7800: run --dir-diff tests with and without symlinksJohn Keeping2013-03-291-8/+19
* t7800: fix tests when difftool uses --no-symlinksJohn Keeping2013-03-291-1/+1
* t7800: don't hide grep outputJohn Keeping2013-03-291-27/+17
* difftool: don't overwrite modified filesJohn Keeping2013-03-291-0/+30
* t7800: move '--symlinks' specific test to the endJohn Keeping2013-03-291-15/+15
* Merge branch 'jk/difftool-dir-diff-edit-fix'Junio C Hamano2013-03-281-0/+22
|\
| * difftool --dir-diff: symlink all files matching the working treeJohn Keeping2013-03-141-0/+22
* | t7800: "defaults" is no longer a builtin tool nameDavid Aguilar2013-02-211-2/+2
* | t7800: modernize testsDavid Aguilar2013-02-201-198/+168
* | t7800: update copyright noticeDavid Aguilar2013-02-191-1/+1
|/
* mergetool--lib: Allow custom commands to override built-insDavid Aguilar2012-09-251-0/+11
* Merge branch 'th/difftool-diffall'Junio C Hamano2012-05-071-0/+57
|\
| * difftool: print list of valid tools with '--tool-help'Tim Henigan2012-04-231-0/+5
| * difftool: teach difftool to handle directory diffsTim Henigan2012-04-231-0/+39
| * difftool: add '--no-gui' optionTim Henigan2012-03-231-0/+13
* | t7800: Test difftool passing arguments to diffda/difftool-testDavid Aguilar2012-03-191-0/+11
|/
* t7800: avoid arithmetic expansion notationsc/difftool-skipJunio C Hamano2011-10-141-2/+2
* git-difftool: allow skipping file by typing 'n' at promptSitaram Chamarty2011-10-101-1/+42
* test: consolidate definition of $LFJunio C Hamano2011-08-111-3/+0
* t7800 (difftool): add missing &&Elijah Newren2010-10-061-6/+6
* t/t7800-difftool.sh: Skip with prereq on no PERLÆvar Arnfjörð Bjarmason2010-08-181-27/+22
* tests: Skip tests in a way that makes sense under TAPÆvar Arnfjörð Bjarmason2010-06-251-1/+1
* difftool: Fix '--gui' when diff.guitool is unconfiguredDavid Aguilar2010-03-281-0/+9
* t7800-difftool.sh: Test mergetool.prompt fallbackDavid Aguilar2010-01-221-0/+12
* difftool: Update copyright notices to list each year separatelyDavid Aguilar2010-01-151-1/+1
* difftool: Use eval to expand '--extcmd' expressionsDavid Aguilar2010-01-151-0/+13
* difftool: Add '-x' and as an alias for '--extcmd'David Aguilar2010-01-151-0/+8
* t7800-difftool.sh: Simplify the --extcmd testDavid Aguilar2010-01-151-8/+5
* difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar2010-01-091-1/+18
* difftool--helper: Remove use of the GIT_MERGE_TOOL variableDavid Aguilar2010-01-091-9/+0
* git-difftool: Add '--gui' for selecting a GUI toolDavid Aguilar2010-01-031-0/+12
* t7800-difftool: Set a bogus tool for use by testsDavid Aguilar2010-01-031-1/+2
* t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT testMarkus Heidelberg2009-10-241-1/+1
* t7800: respect NO_PERLJeff King2009-04-241-0/+5
* difftool: add support for a difftool.prompt config variableDavid Aguilar2009-04-071-0/+64
* difftool: add various git-difftool testsDavid Aguilar2009-04-071-0/+147
View Lorry Controller Status