Age | Commit message (Expand) | Author | Files | Lines |
2020-11-11 | t7800: simplify difftool test | Jinoh Kang | 1 | -19/+9 |
2020-11-06 | diff: allow passing NULL to diff_free_filespec_data() | Jinoh Kang | 1 | -0/+23 |
2020-07-01 | difftool -d: ensure that intent-to-add files are handled correctly | Johannes Schindelin | 1 | -0/+8 |
2020-01-16 | t7800: don't rely on reuse_worktree_file() | Jeff King | 1 | -3/+2 |
2019-05-19 | Merge branch 'dl/difftool-mergetool' | Junio C Hamano | 1 | -0/+24 |
2019-05-13 | difftool: fallback on merge.guitool | Denton Liu | 1 | -0/+16 |
2019-05-13 | difftool: make --gui, --tool and --extcmd mutually exclusive | Denton Liu | 1 | -0/+8 |
2019-03-18 | difftool: allow running outside Git worktrees with --no-index | Johannes Schindelin | 1 | -0/+10 |
2019-01-27 | parse-options: disable option abbreviation with PARSE_OPT_KEEP_UNKNOWN | Nguyễn Thái Ngọc Duy | 1 | -2/+2 |
2018-11-13 | Merge branch 'js/mingw-utf8-env' | Junio C Hamano | 1 | -1/+1 |
2018-10-31 | t7800: fix quoting | Johannes Schindelin | 1 | -1/+1 |
2018-10-07 | t/*: fix ordering of expected/observed arguments | Matthew DeVore | 1 | -1/+1 |
2017-05-11 | tests: fix tests broken under GETTEXT_POISON=YesPlease | Ævar Arnfjörð Bjarmason | 1 | -2/+2 |
2017-04-13 | difftool: fix use-after-free | Johannes Schindelin | 1 | -0/+19 |
2017-03-15 | difftool: handle modified symlinks in dir-diff mode | David Aguilar | 1 | -0/+60 |
2017-03-15 | t7800: cleanup cruft left behind by tests | David Aguilar | 1 | -1/+4 |
2017-03-15 | t7800: remove whitespace before redirect | David Aguilar | 1 | -1/+1 |
2017-02-08 | t7800: replace "wc -l" with test_line_count | David Aguilar | 1 | -12/+19 |
2017-02-08 | Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanup | Junio C Hamano | 1 | -3/+41 |
2017-02-08 | t7800: simplify basic usage test | David Aguilar | 1 | -8/+7 |
2017-02-06 | difftool: fix bug when printing usage | David Aguilar | 1 | -0/+13 |
2017-01-19 | difftool: retire the scripted version | Johannes Schindelin | 1 | -48/+46 |
2017-01-17 | difftool: add a skeleton for the upcoming builtin | Johannes Schindelin | 1 | -0/+2 |
2016-12-08 | difftool: fix dir-diff index creation when in a subdirectory | David Aguilar | 1 | -3/+41 |
2016-08-15 | difftool: always honor fatal error exit codes | John Keeping | 1 | -0/+6 |
2016-08-12 | Merge branch 'jk/difftool-in-subdir' into maint | Junio C Hamano | 1 | -0/+14 |
2016-07-28 | difftool: avoid $GIT_DIR and $GIT_WORK_TREE | David Aguilar | 1 | -0/+14 |
2016-07-11 | Merge branch 'ak/t7800-wo-readlink' into maint | Junio C Hamano | 1 | -1/+1 |
2016-06-21 | t7800: readlink may not be available | Armin Kunaschik | 1 | -1/+1 |
2016-05-23 | Merge branch 'da/difftool' | Junio C Hamano | 1 | -0/+23 |
2016-05-16 | difftool: handle unmerged files in dir-diff mode | David Aguilar | 1 | -0/+23 |
2016-05-03 | Merge branch 'nf/mergetool-prompt' | Junio C Hamano | 1 | -1/+1 |
2016-04-25 | difftool/mergetool: make the form of yes/no questions consistent | Nikola Forró | 1 | -1/+1 |
2016-01-28 | mingw: work around pwd issues in the tests | Johannes Schindelin | 1 | -7/+7 |
2015-12-11 | Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maint | Junio C Hamano | 1 | -4/+4 |
2015-11-03 | Merge branch 'da/difftool' | Junio C Hamano | 1 | -0/+19 |
2015-10-29 | difftool: ignore symbolic links in use_wt_file | David Aguilar | 1 | -0/+19 |
2015-09-08 | t7800: don't use test_config in a subshell | John Keeping | 1 | -4/+4 |
2014-11-14 | difftool: honor --trust-exit-code for builtin tools | David Aguilar | 1 | -0/+5 |
2014-10-28 | difftool: add support for --trust-exit-code | David Aguilar | 1 | -0/+43 |
2014-10-27 | difftool--helper: exit when reading a prompt answer fails | Johannes Sixt | 1 | -0/+8 |
2014-04-21 | run_external_diff: clean up error handling | Jeff King | 1 | -1/+1 |
2014-03-05 | t7800: add a difftool test for .git-files | Junio C Hamano | 1 | -0/+14 |
2013-05-29 | difftool --dir-diff: allow changing any clean working tree file | Kenichi Saita | 1 | -0/+19 |
2013-05-17 | difftool: fix dir-diff when file does not exist in working tree | John Keeping | 1 | -0/+7 |
2013-03-29 | t7800: run --dir-diff tests with and without symlinks | John Keeping | 1 | -8/+19 |
2013-03-29 | t7800: fix tests when difftool uses --no-symlinks | John Keeping | 1 | -1/+1 |
2013-03-29 | t7800: don't hide grep output | John Keeping | 1 | -27/+17 |
2013-03-29 | difftool: don't overwrite modified files | John Keeping | 1 | -0/+30 |
2013-03-29 | t7800: move '--symlinks' specific test to the end | John Keeping | 1 | -15/+15 |