summaryrefslogtreecommitdiff
path: root/git-difftool.perl
AgeCommit message (Expand)Author
2016-12-27Merge branch 'jk/difftool-in-subdir'Junio C Hamano
2016-12-27Merge branch 'va/i18n-perl-scripts'Junio C Hamano
2016-12-14i18n: difftool: mark warnings for translationVasco Almeida
2016-12-12difftool: rename variables for consistencyDavid Aguilar
2016-12-12difftool: chdir as early as possibleDavid Aguilar
2016-12-12difftool: sanitize $workdir as early as possibleDavid Aguilar
2016-12-12difftool: fix dir-diff index creation when in a subdirectoryDavid Aguilar
2016-12-08difftool: fix dir-diff index creation when in a subdirectoryDavid Aguilar
2016-07-28difftool: use Git::* functions instead of passing around stateDavid Aguilar
2016-07-28difftool: avoid $GIT_DIR and $GIT_WORK_TREEDavid Aguilar
2016-07-19difftool: fix argument handling in subdirsJohn Keeping
2016-05-16difftool: handle unmerged files in dir-diff modeDavid Aguilar
2016-05-16difftool: initialize variables for readabilityDavid Aguilar
2015-10-29difftool: ignore symbolic links in use_wt_fileDavid Aguilar
2014-10-29Merge branch 'da/difftool'Junio C Hamano
2014-10-28difftool: add support for --trust-exit-codeDavid Aguilar
2014-10-15difftool: don't assume that default sh is saneCharles Bailey
2014-02-24difftool: support repositories with .git-filesDavid Aguilar
2013-05-29difftool --dir-diff: allow changing any clean working tree fileKenichi Saita
2013-05-17difftool: fix dir-diff when file does not exist in working treeJohn Keeping
2013-03-29difftool: don't overwrite modified filesJohn Keeping
2013-03-28Merge branch 'jk/difftool-dir-diff-edit-fix'Junio C Hamano
2013-03-14difftool --dir-diff: symlink all files matching the working treeJohn Keeping
2013-03-14difftool: avoid double slashes in symlink targetsJohn Keeping
2013-02-17difftool: silence uninitialized variable warningDavid Aguilar
2013-01-25git-difftool: use git-mergetool--lib for "--tool-help"John Keeping
2012-08-21difftool: silence warningRoss Lagerwall
2012-07-26difftool: Disable --symlinks on cygwinDavid Aguilar
2012-07-26difftool: Handle compare() returning -1David Aguilar
2012-07-26difftool: Wrap long lines for readabilityDavid Aguilar
2012-07-25difftool: Check all return codes from compare()David Aguilar
2012-07-25difftool: Handle finding mergetools/ in a path with spacesDavid Aguilar
2012-07-23difftool: Use symlinks when diffing against the worktreeDavid Aguilar
2012-07-23difftool: Call the temp directory "git-difftool"David Aguilar
2012-07-23difftool: Move option values into a hashDavid Aguilar
2012-07-23difftool: Eliminate global variablesDavid Aguilar
2012-07-23difftool: Simplify print_tool_help()David Aguilar
2012-07-19difftool: only copy back files modified during directory diffTim Henigan
2012-04-23difftool: print list of valid tools with '--tool-help'Tim Henigan
2012-04-23difftool: teach difftool to handle directory diffsTim Henigan
2012-03-23difftool: eliminate setup_environment functionTim Henigan
2012-03-23difftool: stop appending '.exe' to gitTim Henigan
2012-03-23difftool: remove explicit change of PATHTim Henigan
2012-03-23difftool: exit(0) when usage is printedTim Henigan
2012-03-23difftool: add '--no-gui' optionTim Henigan
2012-03-23difftool: parse options using Getopt::LongTim Henigan
2011-10-05use -h for synopsis and --help for manpage consistentlyClemens Buchacher
2010-12-14difftool: Fix failure on CygwinRamsay Jones
2010-09-27perl: bump the required Perl version to 5.8 from 5.6.[21]Ævar Arnfjörð Bjarmason
2010-03-28difftool: Fix '--gui' when diff.guitool is unconfiguredDavid Aguilar