summaryrefslogtreecommitdiff
path: root/git-difftool.perl
AgeCommit message (Expand)AuthorFilesLines
2016-12-27Merge branch 'jk/difftool-in-subdir'Libravatar Junio C Hamano1-24/+29
2016-12-27Merge branch 'va/i18n-perl-scripts'Libravatar Junio C Hamano1-10/+12
2016-12-14i18n: difftool: mark warnings for translationLibravatar Vasco Almeida1-10/+12
2016-12-11difftool: rename variables for consistencyLibravatar David Aguilar1-14/+14
2016-12-11difftool: chdir as early as possibleLibravatar David Aguilar1-12/+14
2016-12-11difftool: sanitize $workdir as early as possibleLibravatar David Aguilar1-3/+2
2016-12-11difftool: fix dir-diff index creation when in a subdirectoryLibravatar David Aguilar1-0/+4
2016-12-08difftool: fix dir-diff index creation when in a subdirectoryLibravatar David Aguilar1-0/+4
2016-07-28difftool: use Git::* functions instead of passing around stateLibravatar David Aguilar1-31/+21
2016-07-28difftool: avoid $GIT_DIR and $GIT_WORK_TREELibravatar David Aguilar1-21/+6
2016-07-19difftool: fix argument handling in subdirsLibravatar John Keeping1-10/+3
2016-05-16difftool: handle unmerged files in dir-diff modeLibravatar David Aguilar1-0/+5
2016-05-16difftool: initialize variables for readabilityLibravatar David Aguilar1-2/+2
2015-10-29difftool: ignore symbolic links in use_wt_fileLibravatar David Aguilar1-3/+1
2014-10-29Merge branch 'da/difftool'Libravatar Junio C Hamano1-0/+12
2014-10-28difftool: add support for --trust-exit-codeLibravatar David Aguilar1-0/+12
2014-10-15difftool: don't assume that default sh is saneLibravatar Charles Bailey1-5/+1
2014-02-24difftool: support repositories with .git-filesLibravatar David Aguilar1-16/+2
2013-05-29difftool --dir-diff: allow changing any clean working tree fileLibravatar Kenichi Saita1-7/+2
2013-05-17difftool: fix dir-diff when file does not exist in working treeLibravatar John Keeping1-0/+6
2013-03-29difftool: don't overwrite modified filesLibravatar John Keeping1-14/+71
2013-03-28Merge branch 'jk/difftool-dir-diff-edit-fix'Libravatar Junio C Hamano1-4/+21
2013-03-14difftool --dir-diff: symlink all files matching the working treeLibravatar John Keeping1-3/+18
2013-03-14difftool: avoid double slashes in symlink targetsLibravatar John Keeping1-1/+3
2013-02-17difftool: silence uninitialized variable warningLibravatar David Aguilar1-1/+1
2013-01-25git-difftool: use git-mergetool--lib for "--tool-help"Libravatar John Keeping1-48/+7
2012-08-21difftool: silence warningLibravatar Ross Lagerwall1-1/+1
2012-07-26difftool: Disable --symlinks on cygwinLibravatar David Aguilar1-1/+2
2012-07-26difftool: Handle compare() returning -1Libravatar David Aguilar1-31/+68
2012-07-26difftool: Wrap long lines for readabilityLibravatar David Aguilar1-14/+32
2012-07-25difftool: Check all return codes from compare()Libravatar David Aguilar1-1/+10
2012-07-25difftool: Handle finding mergetools/ in a path with spacesLibravatar David Aguilar1-6/+21
2012-07-23difftool: Use symlinks when diffing against the worktreeLibravatar David Aguilar1-10/+23
2012-07-22difftool: Call the temp directory "git-difftool"Libravatar David Aguilar1-1/+1
2012-07-22difftool: Move option values into a hashLibravatar David Aguilar1-24/+31
2012-07-22difftool: Eliminate global variablesLibravatar David Aguilar1-53/+75
2012-07-22difftool: Simplify print_tool_help()Libravatar David Aguilar1-20/+5
2012-07-19difftool: only copy back files modified during directory diffLibravatar Tim Henigan1-2/+5
2012-04-23difftool: print list of valid tools with '--tool-help'Libravatar Tim Henigan1-2/+53
2012-04-23difftool: teach difftool to handle directory diffsLibravatar Tim Henigan1-21/+245
2012-03-23difftool: eliminate setup_environment functionLibravatar Tim Henigan1-7/+2
2012-03-23difftool: stop appending '.exe' to gitLibravatar Tim Henigan1-10/+1
2012-03-23difftool: remove explicit change of PATHLibravatar Tim Henigan1-4/+0
2012-03-23difftool: exit(0) when usage is printedLibravatar Tim Henigan1-4/+5
2012-03-23difftool: add '--no-gui' optionLibravatar Tim Henigan1-3/+4
2012-03-23difftool: parse options using Getopt::LongLibravatar Tim Henigan1-65/+46
2011-10-05use -h for synopsis and --help for manpage consistentlyLibravatar Clemens Buchacher1-1/+1
2010-12-14difftool: Fix failure on CygwinLibravatar Ramsay Jones1-4/+8
2010-09-27perl: bump the required Perl version to 5.8 from 5.6.[21]Libravatar Ævar Arnfjörð Bjarmason1-0/+1
2010-03-28difftool: Fix '--gui' when diff.guitool is unconfiguredLibravatar David Aguilar1-5/+7