aboutsummaryrefslogtreecommitdiffstats
path: root/git-difftool.perl
AgeCommit message (Expand)AuthorFilesLines
2017-01-17difftool: add a skeleton for the upcoming builtinJohannes Schindelin1-470/+0
2016-07-28difftool: use Git::* functions instead of passing around stateDavid Aguilar1-31/+21
2016-07-28difftool: avoid $GIT_DIR and $GIT_WORK_TREEDavid Aguilar1-21/+6
2016-07-19difftool: fix argument handling in subdirsJohn Keeping1-10/+3
2016-05-16difftool: handle unmerged files in dir-diff modeDavid Aguilar1-0/+5
2016-05-16difftool: initialize variables for readabilityDavid Aguilar1-2/+2
2015-10-29difftool: ignore symbolic links in use_wt_fileDavid Aguilar1-3/+1
2014-10-29Merge branch 'da/difftool'Junio C Hamano1-0/+12
2014-10-28difftool: add support for --trust-exit-codeDavid Aguilar1-0/+12
2014-10-15difftool: don't assume that default sh is saneCharles Bailey1-5/+1
2014-02-24difftool: support repositories with .git-filesDavid Aguilar1-16/+2
2013-05-29difftool --dir-diff: allow changing any clean working tree fileKenichi Saita1-7/+2
2013-05-17difftool: fix dir-diff when file does not exist in working treeJohn Keeping1-0/+6
2013-03-29difftool: don't overwrite modified filesJohn Keeping1-14/+71
2013-03-28Merge branch 'jk/difftool-dir-diff-edit-fix'Junio C Hamano1-4/+21
2013-03-14difftool --dir-diff: symlink all files matching the working treeJohn Keeping1-3/+18
2013-03-14difftool: avoid double slashes in symlink targetsJohn Keeping1-1/+3
2013-02-17difftool: silence uninitialized variable warningDavid Aguilar1-1/+1
2013-01-25git-difftool: use git-mergetool--lib for "--tool-help"John Keeping1-48/+7
2012-08-21difftool: silence warningRoss Lagerwall1-1/+1
2012-07-26difftool: Disable --symlinks on cygwinDavid Aguilar1-1/+2
2012-07-26difftool: Handle compare() returning -1David Aguilar1-31/+68
2012-07-26difftool: Wrap long lines for readabilityDavid Aguilar1-14/+32
2012-07-25difftool: Check all return codes from compare()David Aguilar1-1/+10
2012-07-25difftool: Handle finding mergetools/ in a path with spacesDavid Aguilar1-6/+21
2012-07-23difftool: Use symlinks when diffing against the worktreeDavid Aguilar1-10/+23
2012-07-22difftool: Call the temp directory "git-difftool"David Aguilar1-1/+1
2012-07-22difftool: Move option values into a hashDavid Aguilar1-24/+31
2012-07-22difftool: Eliminate global variablesDavid Aguilar1-53/+75
2012-07-22difftool: Simplify print_tool_help()David Aguilar1-20/+5
2012-07-19difftool: only copy back files modified during directory diffTim Henigan1-2/+5
2012-04-23difftool: print list of valid tools with '--tool-help'Tim Henigan1-2/+53
2012-04-23difftool: teach difftool to handle directory diffsTim Henigan1-21/+245
2012-03-23difftool: eliminate setup_environment functionTim Henigan1-7/+2
2012-03-23difftool: stop appending '.exe' to gitTim Henigan1-10/+1
2012-03-23difftool: remove explicit change of PATHTim Henigan1-4/+0
2012-03-23difftool: exit(0) when usage is printedTim Henigan1-4/+5
2012-03-23difftool: add '--no-gui' optionTim Henigan1-3/+4
2012-03-23difftool: parse options using Getopt::LongTim Henigan1-65/+46
2011-10-05use -h for synopsis and --help for manpage consistentlyClemens Buchacher1-1/+1
2010-12-14difftool: Fix failure on CygwinRamsay Jones1-4/+8
2010-09-27perl: bump the required Perl version to 5.8 from 5.6.[21]Ævar Arnfjörð Bjarmason1-0/+1
2010-03-28difftool: Fix '--gui' when diff.guitool is unconfiguredDavid Aguilar1-5/+7
2010-01-15difftool: Add '-x' and as an alias for '--extcmd'David Aguilar1-7/+14
2010-01-09difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar1-0/+4
2010-01-03git-difftool: Add '--gui' for selecting a GUI toolDavid Aguilar1-1/+12
2009-04-24Explain seemingly pointless use of system in difftoolAlex Riesen1-0/+6
2009-04-22Wait for git diff to finish in git difftoolAlex Riesen1-1/+2
2009-04-07difftool: add support for a difftool.prompt config variableDavid Aguilar1-3/+12
2009-04-07difftool: move 'git-difftool' out of contribDavid Aguilar1-0/+76