summaryrefslogtreecommitdiff
path: root/t/t7800-difftool.sh
Commit message (Expand)AuthorAgeFilesLines
* difftool -d: ensure that intent-to-add files are handled correctlyJohannes Schindelin2020-07-011-0/+8
* t7800: don't rely on reuse_worktree_file()Jeff King2020-01-161-3/+2
* Merge branch 'dl/difftool-mergetool'Junio C Hamano2019-05-191-0/+24
|\
| * difftool: fallback on merge.guitoolDenton Liu2019-05-131-0/+16
| * difftool: make --gui, --tool and --extcmd mutually exclusiveDenton Liu2019-05-131-0/+8
* | difftool: allow running outside Git worktrees with --no-indexJohannes Schindelin2019-03-181-0/+10
* | parse-options: disable option abbreviation with PARSE_OPT_KEEP_UNKNOWNNguyễn Thái Ngọc Duy2019-01-271-2/+2
* | Merge branch 'js/mingw-utf8-env'Junio C Hamano2018-11-131-1/+1
|\ \ | |/ |/|
| * t7800: fix quotingJohannes Schindelin2018-10-311-1/+1
* | t/*: fix ordering of expected/observed argumentsMatthew DeVore2018-10-071-1/+1
|/
* tests: fix tests broken under GETTEXT_POISON=YesPleaseÆvar Arnfjörð Bjarmason2017-05-111-2/+2
* difftool: fix use-after-freejs/difftool-builtinJohannes Schindelin2017-04-131-0/+19
* difftool: handle modified symlinks in dir-diff modeDavid Aguilar2017-03-151-0/+60
* t7800: cleanup cruft left behind by testsDavid Aguilar2017-03-151-1/+4
* t7800: remove whitespace before redirectDavid Aguilar2017-03-151-1/+1
* t7800: replace "wc -l" with test_line_countda/t7800-cleanupDavid Aguilar2017-02-081-12/+19
* Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanupJunio C Hamano2017-02-081-3/+41
|\
| * difftool: fix dir-diff index creation when in a subdirectoryda/difftool-dir-diff-fixDavid Aguilar2016-12-081-3/+41
* | t7800: simplify basic usage testDavid Aguilar2017-02-081-8/+7
* | difftool: fix bug when printing usageDavid Aguilar2017-02-061-0/+13
* | difftool: retire the scripted versionJohannes Schindelin2017-01-191-48/+46
* | difftool: add a skeleton for the upcoming builtinJohannes Schindelin2017-01-171-0/+2
|/
* difftool: always honor fatal error exit codesjk/difftool-command-not-foundJohn Keeping2016-08-151-0/+6
* Merge branch 'jk/difftool-in-subdir' into maintJunio C Hamano2016-08-121-0/+14
|\
| * difftool: avoid $GIT_DIR and $GIT_WORK_TREEDavid Aguilar2016-07-281-0/+14
* | Merge branch 'ak/t7800-wo-readlink' into maintJunio C Hamano2016-07-111-1/+1
|\ \ | |/ |/|
| * t7800: readlink may not be availableak/t7800-wo-readlinkArmin Kunaschik2016-06-211-1/+1
* | Merge branch 'da/difftool'Junio C Hamano2016-05-231-0/+23
|\ \
| * | difftool: handle unmerged files in dir-diff modeda/difftoolDavid Aguilar2016-05-161-0/+23
* | | Merge branch 'nf/mergetool-prompt'Junio C Hamano2016-05-031-1/+1
|\ \ \ | |/ / |/| |
| * | difftool/mergetool: make the form of yes/no questions consistentnf/mergetool-promptNikola Forró2016-04-251-1/+1
| * | Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maintJunio C Hamano2015-12-111-4/+4
| |\ \
* | | | mingw: work around pwd issues in the testsJohannes Schindelin2016-01-281-7/+7
* | | | Merge branch 'da/difftool'Junio C Hamano2015-11-031-0/+19
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | difftool: ignore symbolic links in use_wt_fileDavid Aguilar2015-10-291-0/+19
| |/
* | t7800: don't use test_config in a subshellJohn Keeping2015-09-081-4/+4
|/
* difftool: honor --trust-exit-code for builtin toolsDavid Aguilar2014-11-141-0/+5
* difftool: add support for --trust-exit-codeDavid Aguilar2014-10-281-0/+43
* difftool--helper: exit when reading a prompt answer failsJohannes Sixt2014-10-271-0/+8
* 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
View Lorry Controller Status