Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/t/t7800-difftool.sh
AgeCommit message (Expand)Author
2017-02-09t7800: replace "wc -l" with test_line_countDavid Aguilar
2017-02-09Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanupJunio C Hamano
2017-02-09t7800: simplify basic usage testDavid Aguilar
2017-02-06difftool: fix bug when printing usageDavid Aguilar
2017-01-20difftool: retire the scripted versionJohannes Schindelin
2017-01-18difftool: add a skeleton for the upcoming builtinJohannes Schindelin
2016-12-08difftool: fix dir-diff index creation when in a subdirectoryDavid Aguilar
2016-08-16difftool: always honor fatal error exit codesJohn Keeping
2016-08-12Merge branch 'jk/difftool-in-subdir' into maintJunio C Hamano
2016-07-29difftool: avoid $GIT_DIR and $GIT_WORK_TREEDavid Aguilar
2016-07-11Merge branch 'ak/t7800-wo-readlink' into maintJunio C Hamano
2016-06-21t7800: readlink may not be availableArmin Kunaschik
2016-05-24Merge branch 'da/difftool'Junio C Hamano
2016-05-17difftool: handle unmerged files in dir-diff modeDavid Aguilar
2016-05-04Merge branch 'nf/mergetool-prompt'Junio C Hamano
2016-04-26difftool/mergetool: make the form of yes/no questions consistentNikola Forró
2016-01-29mingw: work around pwd issues in the testsJohannes Schindelin
2015-12-11Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maintJunio C Hamano
2015-11-04Merge branch 'da/difftool'Junio C Hamano
2015-10-29difftool: ignore symbolic links in use_wt_fileDavid Aguilar
2015-09-08t7800: don't use test_config in a subshellJohn Keeping
2014-11-15difftool: honor --trust-exit-code for builtin toolsDavid Aguilar
2014-10-28difftool: add support for --trust-exit-codeDavid Aguilar
2014-10-27difftool--helper: exit when reading a prompt answer failsJohannes Sixt
2014-04-21run_external_diff: clean up error handlingJeff King
2014-03-06t7800: add a difftool test for .git-filesJunio C Hamano
2013-05-29difftool --dir-diff: allow changing any clean working tree fileKenichi Saita
2013-05-17difftool: fix dir-diff when file does not exist in working treeJohn Keeping
2013-03-30t7800: run --dir-diff tests with and without symlinksJohn Keeping
2013-03-30t7800: fix tests when difftool uses --no-symlinksJohn Keeping
2013-03-30t7800: don't hide grep outputJohn Keeping
2013-03-30difftool: don't overwrite modified filesJohn Keeping
2013-03-29t7800: move '--symlinks' specific test to the endJohn Keeping
2013-03-29Merge branch 'jk/difftool-dir-diff-edit-fix'Junio C Hamano
2013-03-15difftool --dir-diff: symlink all files matching the working treeJohn Keeping
2013-02-22t7800: "defaults" is no longer a builtin tool nameDavid Aguilar
2013-02-21t7800: modernize testsDavid Aguilar
2013-02-20t7800: update copyright noticeDavid Aguilar
2012-09-25mergetool--lib: Allow custom commands to override built-insDavid Aguilar
2012-05-08Merge branch 'th/difftool-diffall'Junio C Hamano
2012-04-23difftool: print list of valid tools with '--tool-help'Tim Henigan
2012-04-23difftool: teach difftool to handle directory diffsTim Henigan
2012-03-23difftool: add '--no-gui' optionTim Henigan
2012-03-19t7800: Test difftool passing arguments to diffDavid Aguilar
2011-10-14t7800: avoid arithmetic expansion notationJunio C Hamano
2011-10-10git-difftool: allow skipping file by typing 'n' at promptSitaram Chamarty
2011-08-12test: consolidate definition of $LFJunio C Hamano
2010-10-07t7800 (difftool): add missing &&Elijah Newren
2010-08-18t/t7800-difftool.sh: Skip with prereq on no PERLÆvar Arnfjörð Bjarmason
2010-06-25tests: Skip tests in a way that makes sense under TAPÆvar Arnfjörð Bjarmason
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 17:27:39 +0300