aboutsummaryrefslogtreecommitdiff
path: root/t/t7800-difftool.sh
Commit message (Expand)AuthorAge
* difftool: always honor fatal error exit codesJohn Keeping2016-08-15
* Merge branch 'jk/difftool-in-subdir' into maintJunio C Hamano2016-08-12
|\
| * difftool: avoid $GIT_DIR and $GIT_WORK_TREEDavid Aguilar2016-07-28
* | Merge branch 'ak/t7800-wo-readlink' into maintJunio C Hamano2016-07-11
|\ \ | |/ |/|
| * t7800: readlink may not be availableArmin Kunaschik2016-06-21
* | Merge branch 'da/difftool'Junio C Hamano2016-05-23
|\ \
| * | difftool: handle unmerged files in dir-diff modeDavid Aguilar2016-05-16
* | | Merge branch 'nf/mergetool-prompt'Junio C Hamano2016-05-03
|\ \ \ | |/ / |/| |
| * | difftool/mergetool: make the form of yes/no questions consistentNikola Forró2016-04-25
| * | Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maintJunio C Hamano2015-12-11
| |\ \
* | | | mingw: work around pwd issues in the testsJohannes Schindelin2016-01-28
* | | | Merge branch 'da/difftool'Junio C Hamano2015-11-03
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | difftool: ignore symbolic links in use_wt_fileDavid Aguilar2015-10-29
| |/
* | t7800: don't use test_config in a subshellJohn Keeping2015-09-08
|/
* difftool: honor --trust-exit-code for builtin toolsDavid Aguilar2014-11-14
* difftool: add support for --trust-exit-codeDavid Aguilar2014-10-28
* difftool--helper: exit when reading a prompt answer failsJohannes Sixt2014-10-27
* run_external_diff: clean up error handlingJeff King2014-04-21
* t7800: add a difftool test for .git-filesJunio C Hamano2014-03-05
* difftool --dir-diff: allow changing any clean working tree fileKenichi Saita2013-05-29
* difftool: fix dir-diff when file does not exist in working treeJohn Keeping2013-05-17
* t7800: run --dir-diff tests with and without symlinksJohn Keeping2013-03-29
* t7800: fix tests when difftool uses --no-symlinksJohn Keeping2013-03-29
* t7800: don't hide grep outputJohn Keeping2013-03-29
* difftool: don't overwrite modified filesJohn Keeping2013-03-29
* t7800: move '--symlinks' specific test to the endJohn Keeping2013-03-29
* Merge branch 'jk/difftool-dir-diff-edit-fix'Junio C Hamano2013-03-28
|\
| * difftool --dir-diff: symlink all files matching the working treeJohn Keeping2013-03-14
* | t7800: "defaults" is no longer a builtin tool nameDavid Aguilar2013-02-21
* | t7800: modernize testsDavid Aguilar2013-02-20
* | t7800: update copyright noticeDavid Aguilar2013-02-19
|/
* mergetool--lib: Allow custom commands to override built-insDavid Aguilar2012-09-25
* Merge branch 'th/difftool-diffall'Junio C Hamano2012-05-07
|\
| * difftool: print list of valid tools with '--tool-help'Tim Henigan2012-04-23
| * difftool: teach difftool to handle directory diffsTim Henigan2012-04-23
| * difftool: add '--no-gui' optionTim Henigan2012-03-23
* | t7800: Test difftool passing arguments to diffDavid Aguilar2012-03-19
|/
* t7800: avoid arithmetic expansion notationJunio C Hamano2011-10-14
* git-difftool: allow skipping file by typing 'n' at promptSitaram Chamarty2011-10-10
* test: consolidate definition of $LFJunio C Hamano2011-08-11
* t7800 (difftool): add missing &&Elijah Newren2010-10-06
* t/t7800-difftool.sh: Skip with prereq on no PERLÆvar Arnfjörð Bjarmason2010-08-18
* tests: Skip tests in a way that makes sense under TAPÆvar Arnfjörð Bjarmason2010-06-25
* difftool: Fix '--gui' when diff.guitool is unconfiguredDavid Aguilar2010-03-28
* t7800-difftool.sh: Test mergetool.prompt fallbackDavid Aguilar2010-01-22
* difftool: Update copyright notices to list each year separatelyDavid Aguilar2010-01-15
* difftool: Use eval to expand '--extcmd' expressionsDavid Aguilar2010-01-15
* difftool: Add '-x' and as an alias for '--extcmd'David Aguilar2010-01-15
* t7800-difftool.sh: Simplify the --extcmd testDavid Aguilar2010-01-15
* difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar2010-01-09