| Commit message (Expand) | Author | Age | Files | Lines |
* | difftool: handle modified symlinks in dir-diff mode | David Aguilar | 2017-03-15 | 1 | -0/+60 |
* | t7800: cleanup cruft left behind by tests | David Aguilar | 2017-03-15 | 1 | -1/+4 |
* | t7800: remove whitespace before redirect | David Aguilar | 2017-03-15 | 1 | -1/+1 |
* | t7800: replace "wc -l" with test_line_countda/t7800-cleanup | David Aguilar | 2017-02-08 | 1 | -12/+19 |
* | Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanup | Junio C Hamano | 2017-02-08 | 1 | -3/+41 |
|\ |
|
| * | difftool: fix dir-diff index creation when in a subdirectoryda/difftool-dir-diff-fix | David Aguilar | 2016-12-08 | 1 | -3/+41 |
* | | t7800: simplify basic usage test | David Aguilar | 2017-02-08 | 1 | -8/+7 |
* | | difftool: fix bug when printing usage | David Aguilar | 2017-02-06 | 1 | -0/+13 |
* | | difftool: retire the scripted version | Johannes Schindelin | 2017-01-19 | 1 | -48/+46 |
* | | difftool: add a skeleton for the upcoming builtin | Johannes Schindelin | 2017-01-17 | 1 | -0/+2 |
|/ |
|
* | difftool: always honor fatal error exit codesjk/difftool-command-not-found | John Keeping | 2016-08-15 | 1 | -0/+6 |
* | Merge branch 'jk/difftool-in-subdir' into maint | Junio C Hamano | 2016-08-12 | 1 | -0/+14 |
|\ |
|
| * | difftool: avoid $GIT_DIR and $GIT_WORK_TREE | David Aguilar | 2016-07-28 | 1 | -0/+14 |
* | | Merge branch 'ak/t7800-wo-readlink' into maint | Junio C Hamano | 2016-07-11 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | t7800: readlink may not be availableak/t7800-wo-readlink | Armin Kunaschik | 2016-06-21 | 1 | -1/+1 |
* | | Merge branch 'da/difftool' | Junio C Hamano | 2016-05-23 | 1 | -0/+23 |
|\ \ |
|
| * | | difftool: handle unmerged files in dir-diff modeda/difftool | David Aguilar | 2016-05-16 | 1 | -0/+23 |
* | | | Merge branch 'nf/mergetool-prompt' | Junio C Hamano | 2016-05-03 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | difftool/mergetool: make the form of yes/no questions consistentnf/mergetool-prompt | Nikola Forró | 2016-04-25 | 1 | -1/+1 |
| * | | Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maint | Junio C Hamano | 2015-12-11 | 1 | -4/+4 |
| |\ \ |
|
* | | | | mingw: work around pwd issues in the tests | Johannes Schindelin | 2016-01-28 | 1 | -7/+7 |
* | | | | Merge branch 'da/difftool' | Junio C Hamano | 2015-11-03 | 1 | -0/+19 |
|\ \ \ \
| |/ / /
| | / /
| |/ /
|/| | |
|
| * | | difftool: ignore symbolic links in use_wt_file | David Aguilar | 2015-10-29 | 1 | -0/+19 |
| |/ |
|
* | | t7800: don't use test_config in a subshell | John Keeping | 2015-09-08 | 1 | -4/+4 |
|/ |
|
* | difftool: honor --trust-exit-code for builtin tools | David Aguilar | 2014-11-14 | 1 | -0/+5 |
* | difftool: add support for --trust-exit-code | David Aguilar | 2014-10-28 | 1 | -0/+43 |
* | difftool--helper: exit when reading a prompt answer fails | Johannes Sixt | 2014-10-27 | 1 | -0/+8 |
* | run_external_diff: clean up error handling | Jeff King | 2014-04-21 | 1 | -1/+1 |
* | t7800: add a difftool test for .git-filesda/difftool-git-files | Junio C Hamano | 2014-03-05 | 1 | -0/+14 |
* | difftool --dir-diff: allow changing any clean working tree file | Kenichi Saita | 2013-05-29 | 1 | -0/+19 |
* | difftool: fix dir-diff when file does not exist in working tree | John Keeping | 2013-05-17 | 1 | -0/+7 |
* | t7800: run --dir-diff tests with and without symlinks | John Keeping | 2013-03-29 | 1 | -8/+19 |
* | t7800: fix tests when difftool uses --no-symlinks | John Keeping | 2013-03-29 | 1 | -1/+1 |
* | t7800: don't hide grep output | John Keeping | 2013-03-29 | 1 | -27/+17 |
* | difftool: don't overwrite modified files | John Keeping | 2013-03-29 | 1 | -0/+30 |
* | t7800: move '--symlinks' specific test to the end | John Keeping | 2013-03-29 | 1 | -15/+15 |
* | Merge branch 'jk/difftool-dir-diff-edit-fix' | Junio C Hamano | 2013-03-28 | 1 | -0/+22 |
|\ |
|
| * | difftool --dir-diff: symlink all files matching the working tree | John Keeping | 2013-03-14 | 1 | -0/+22 |
* | | t7800: "defaults" is no longer a builtin tool name | David Aguilar | 2013-02-21 | 1 | -2/+2 |
* | | t7800: modernize tests | David Aguilar | 2013-02-20 | 1 | -198/+168 |
* | | t7800: update copyright notice | David Aguilar | 2013-02-19 | 1 | -1/+1 |
|/ |
|
* | mergetool--lib: Allow custom commands to override built-ins | David Aguilar | 2012-09-25 | 1 | -0/+11 |
* | Merge branch 'th/difftool-diffall' | Junio C Hamano | 2012-05-07 | 1 | -0/+57 |
|\ |
|
| * | difftool: print list of valid tools with '--tool-help' | Tim Henigan | 2012-04-23 | 1 | -0/+5 |
| * | difftool: teach difftool to handle directory diffs | Tim Henigan | 2012-04-23 | 1 | -0/+39 |
| * | difftool: add '--no-gui' option | Tim Henigan | 2012-03-23 | 1 | -0/+13 |
* | | t7800: Test difftool passing arguments to diffda/difftool-test | David Aguilar | 2012-03-19 | 1 | -0/+11 |
|/ |
|
* | t7800: avoid arithmetic expansion notationsc/difftool-skip | Junio C Hamano | 2011-10-14 | 1 | -2/+2 |
* | git-difftool: allow skipping file by typing 'n' at prompt | Sitaram Chamarty | 2011-10-10 | 1 | -1/+42 |
* | test: consolidate definition of $LF | Junio C Hamano | 2011-08-11 | 1 | -3/+0 |