| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | 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 |
| * | t7800 (difftool): add missing && | Elijah Newren | 2010-10-06 | 1 | -6/+6 |
| * | t/t7800-difftool.sh: Skip with prereq on no PERL | Ævar Arnfjörð Bjarmason | 2010-08-18 | 1 | -27/+22 |
| * | tests: Skip tests in a way that makes sense under TAP | Ævar Arnfjörð Bjarmason | 2010-06-25 | 1 | -1/+1 |
| * | difftool: Fix '--gui' when diff.guitool is unconfigured | David Aguilar | 2010-03-28 | 1 | -0/+9 |
| * | t7800-difftool.sh: Test mergetool.prompt fallback | David Aguilar | 2010-01-22 | 1 | -0/+12 |
| * | difftool: Update copyright notices to list each year separately | David Aguilar | 2010-01-15 | 1 | -1/+1 |
| * | difftool: Use eval to expand '--extcmd' expressions | David Aguilar | 2010-01-15 | 1 | -0/+13 |
| * | difftool: Add '-x' and as an alias for '--extcmd' | David Aguilar | 2010-01-15 | 1 | -0/+8 |
| * | t7800-difftool.sh: Simplify the --extcmd test | David Aguilar | 2010-01-15 | 1 | -8/+5 |
| * | difftool: Allow specifying unconfigured commands with --extcmd | David Aguilar | 2010-01-09 | 1 | -1/+18 |
| * | difftool--helper: Remove use of the GIT_MERGE_TOOL variable | David Aguilar | 2010-01-09 | 1 | -9/+0 |
| * | git-difftool: Add '--gui' for selecting a GUI tool | David Aguilar | 2010-01-03 | 1 | -0/+12 |
| * | t7800-difftool: Set a bogus tool for use by tests | David Aguilar | 2010-01-03 | 1 | -1/+2 |
| * | t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test | Markus Heidelberg | 2009-10-24 | 1 | -1/+1 |
| * | t7800: respect NO_PERL | Jeff King | 2009-04-24 | 1 | -0/+5 |
| * | difftool: add support for a difftool.prompt config variable | David Aguilar | 2009-04-07 | 1 | -0/+64 |
| * | difftool: add various git-difftool tests | David Aguilar | 2009-04-07 | 1 | -0/+147 |
