summaryrefslogtreecommitdiff
path: root/t/t7800-difftool.sh
Commit message (Expand)AuthorAgeFilesLines
* mergetool: new config guiDefault supports auto-toggling gui by DISPLAYTao Klerks2023-04-051-0/+52
* Sync with 2.33.5Taylor Blau2022-10-061-0/+1
|\
| * Sync with 2.32.4Taylor Blau2022-10-061-0/+1
| |\
| | * Sync with 2.30.6Taylor Blau2022-10-061-0/+1
| | |\
| | | * t/t7NNN: allow local submodulesTaylor Blau2022-10-011-0/+1
| * | | Merge branch 'da/difftool-dir-diff-symlink-fix' into maintJunio C Hamano2021-10-121-2/+65
| |\ \ \
* | | | | difftool: create a tmpdir path without repeated slashesDavid Aguilar2021-09-301-0/+7
* | | | | Merge branch 'da/difftool-dir-diff-symlink-fix' into da/difftoolJunio C Hamano2021-09-231-2/+65
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | difftool: fix symlink-file writing in dir-diff modeDavid Aguilar2021-09-231-2/+65
| |/ /
* | | t: fix whitespace around &&Andrei Rybak2021-06-081-1/+1
|/ /
* | difftool.c: learn a new way start at specified fileZheNing Hu2021-02-221-0/+32
* | Merge branch 'sg/t7800-difftool-robustify'Junio C Hamano2021-02-101-19/+19
|\ \
| * | t7800-difftool: don't accidentally match tmp dirsSZEDER Gábor2021-01-091-19/+19
* | | t7[5-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-20/+20
* | | tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
| |/ |/|
* | t7800: simplify difftool testJinoh Kang2020-11-111-19/+9
* | diff: allow passing NULL to diff_free_filespec_data()Jinoh Kang2020-11-061-0/+23
|/
* 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
View Lorry Controller Status