| Commit message (Expand) | Author | Age | Files | Lines |
* | difftool: support repositories with .git-files | David Aguilar | 2014-02-24 | 1 | -16/+2 |
* | difftool --dir-diff: allow changing any clean working tree file | Kenichi Saita | 2013-05-29 | 1 | -7/+2 |
* | difftool: fix dir-diff when file does not exist in working tree | John Keeping | 2013-05-17 | 1 | -0/+6 |
* | difftool: don't overwrite modified files | John Keeping | 2013-03-29 | 1 | -14/+71 |
* | Merge branch 'jk/difftool-dir-diff-edit-fix' | Junio C Hamano | 2013-03-28 | 1 | -4/+21 |
|\ |
|
| * | difftool --dir-diff: symlink all files matching the working tree | John Keeping | 2013-03-14 | 1 | -3/+18 |
| * | difftool: avoid double slashes in symlink targets | John Keeping | 2013-03-14 | 1 | -1/+3 |
* | | difftool: silence uninitialized variable warning | David Aguilar | 2013-02-17 | 1 | -1/+1 |
|/ |
|
* | git-difftool: use git-mergetool--lib for "--tool-help" | John Keeping | 2013-01-25 | 1 | -48/+7 |
* | difftool: silence warning | Ross Lagerwall | 2012-08-21 | 1 | -1/+1 |
* | difftool: Disable --symlinks on cygwin | David Aguilar | 2012-07-26 | 1 | -1/+2 |
* | difftool: Handle compare() returning -1 | David Aguilar | 2012-07-26 | 1 | -31/+68 |
* | difftool: Wrap long lines for readability | David Aguilar | 2012-07-26 | 1 | -14/+32 |
* | difftool: Check all return codes from compare() | David Aguilar | 2012-07-25 | 1 | -1/+10 |
* | difftool: Handle finding mergetools/ in a path with spaces | David Aguilar | 2012-07-25 | 1 | -6/+21 |
* | difftool: Use symlinks when diffing against the worktree | David Aguilar | 2012-07-23 | 1 | -10/+23 |
* | difftool: Call the temp directory "git-difftool" | David Aguilar | 2012-07-22 | 1 | -1/+1 |
* | difftool: Move option values into a hash | David Aguilar | 2012-07-22 | 1 | -24/+31 |
* | difftool: Eliminate global variables | David Aguilar | 2012-07-22 | 1 | -53/+75 |
* | difftool: Simplify print_tool_help() | David Aguilar | 2012-07-22 | 1 | -20/+5 |
* | difftool: only copy back files modified during directory diff | Tim Henigan | 2012-07-19 | 1 | -2/+5 |
* | difftool: print list of valid tools with '--tool-help' | Tim Henigan | 2012-04-23 | 1 | -2/+53 |
* | difftool: teach difftool to handle directory diffs | Tim Henigan | 2012-04-23 | 1 | -21/+245 |
* | difftool: eliminate setup_environment function | Tim Henigan | 2012-03-23 | 1 | -7/+2 |
* | difftool: stop appending '.exe' to git | Tim Henigan | 2012-03-23 | 1 | -10/+1 |
* | difftool: remove explicit change of PATH | Tim Henigan | 2012-03-23 | 1 | -4/+0 |
* | difftool: exit(0) when usage is printed | Tim Henigan | 2012-03-23 | 1 | -4/+5 |
* | difftool: add '--no-gui' option | Tim Henigan | 2012-03-23 | 1 | -3/+4 |
* | difftool: parse options using Getopt::Long | Tim Henigan | 2012-03-23 | 1 | -65/+46 |
* | use -h for synopsis and --help for manpage consistentlycb/do-not-pretend-to-hijack-long-help | Clemens Buchacher | 2011-10-05 | 1 | -1/+1 |
* | difftool: Fix failure on Cygwin | Ramsay Jones | 2010-12-14 | 1 | -4/+8 |
* | perl: bump the required Perl version to 5.8 from 5.6.[21] | Ævar Arnfjörð Bjarmason | 2010-09-27 | 1 | -0/+1 |
* | difftool: Fix '--gui' when diff.guitool is unconfigured | David Aguilar | 2010-03-28 | 1 | -5/+7 |
* | difftool: Add '-x' and as an alias for '--extcmd' | David Aguilar | 2010-01-15 | 1 | -7/+14 |
* | difftool: Allow specifying unconfigured commands with --extcmd | David Aguilar | 2010-01-09 | 1 | -0/+4 |
* | git-difftool: Add '--gui' for selecting a GUI tool | David Aguilar | 2010-01-03 | 1 | -1/+12 |
* | Explain seemingly pointless use of system in difftool | Alex Riesen | 2009-04-24 | 1 | -0/+6 |
* | Wait for git diff to finish in git difftool | Alex Riesen | 2009-04-22 | 1 | -1/+2 |
* | difftool: add support for a difftool.prompt config variable | David Aguilar | 2009-04-07 | 1 | -3/+12 |
* | difftool: move 'git-difftool' out of contrib | David Aguilar | 2009-04-07 | 1 | -0/+76 |