summaryrefslogtreecommitdiff
path: root/git-difftool.perl
Commit message (Expand)AuthorAgeFilesLines
* difftool: add a skeleton for the upcoming builtinJohannes Schindelin2017-01-171-470/+0
* difftool: use Git::* functions instead of passing around stateDavid Aguilar2016-07-281-31/+21
* difftool: avoid $GIT_DIR and $GIT_WORK_TREEDavid Aguilar2016-07-281-21/+6
* difftool: fix argument handling in subdirsJohn Keeping2016-07-191-10/+3
* difftool: handle unmerged files in dir-diff modeda/difftoolDavid Aguilar2016-05-161-0/+5
* difftool: initialize variables for readabilityDavid Aguilar2016-05-161-2/+2
* difftool: ignore symbolic links in use_wt_fileDavid Aguilar2015-10-291-3/+1
* Merge branch 'da/difftool'Junio C Hamano2014-10-291-0/+12
|\
| * difftool: add support for --trust-exit-codeDavid Aguilar2014-10-281-0/+12
* | difftool: don't assume that default sh is saneda/mergetool-tool-helpCharles Bailey2014-10-151-5/+1
|/
* difftool: support repositories with .git-filesDavid Aguilar2014-02-241-16/+2
* difftool --dir-diff: allow changing any clean working tree fileKenichi Saita2013-05-291-7/+2
* difftool: fix dir-diff when file does not exist in working treeJohn Keeping2013-05-171-0/+6
* difftool: don't overwrite modified filesJohn Keeping2013-03-291-14/+71
* Merge branch 'jk/difftool-dir-diff-edit-fix'Junio C Hamano2013-03-281-4/+21
|\
| * difftool --dir-diff: symlink all files matching the working treeJohn Keeping2013-03-141-3/+18
| * difftool: avoid double slashes in symlink targetsJohn Keeping2013-03-141-1/+3
* | difftool: silence uninitialized variable warningDavid Aguilar2013-02-171-1/+1
|/
* git-difftool: use git-mergetool--lib for "--tool-help"John Keeping2013-01-251-48/+7
* difftool: silence warningRoss Lagerwall2012-08-211-1/+1
* difftool: Disable --symlinks on cygwinDavid Aguilar2012-07-261-1/+2
* difftool: Handle compare() returning -1David Aguilar2012-07-261-31/+68
* difftool: Wrap long lines for readabilityDavid Aguilar2012-07-261-14/+32
* difftool: Check all return codes from compare()David Aguilar2012-07-251-1/+10
* difftool: Handle finding mergetools/ in a path with spacesDavid Aguilar2012-07-251-6/+21
* difftool: Use symlinks when diffing against the worktreeDavid Aguilar2012-07-231-10/+23
* difftool: Call the temp directory "git-difftool"David Aguilar2012-07-221-1/+1
* difftool: Move option values into a hashDavid Aguilar2012-07-221-24/+31
* difftool: Eliminate global variablesDavid Aguilar2012-07-221-53/+75
* difftool: Simplify print_tool_help()David Aguilar2012-07-221-20/+5
* difftool: only copy back files modified during directory diffTim Henigan2012-07-191-2/+5
* difftool: print list of valid tools with '--tool-help'Tim Henigan2012-04-231-2/+53
* difftool: teach difftool to handle directory diffsTim Henigan2012-04-231-21/+245
* difftool: eliminate setup_environment functionTim Henigan2012-03-231-7/+2
* difftool: stop appending '.exe' to gitTim Henigan2012-03-231-10/+1
* difftool: remove explicit change of PATHTim Henigan2012-03-231-4/+0
* difftool: exit(0) when usage is printedTim Henigan2012-03-231-4/+5
* difftool: add '--no-gui' optionTim Henigan2012-03-231-3/+4
* difftool: parse options using Getopt::LongTim Henigan2012-03-231-65/+46
* use -h for synopsis and --help for manpage consistentlycb/do-not-pretend-to-hijack-long-helpClemens Buchacher2011-10-051-1/+1
* difftool: Fix failure on CygwinRamsay Jones2010-12-141-4/+8
* perl: bump the required Perl version to 5.8 from 5.6.[21]Ævar Arnfjörð Bjarmason2010-09-271-0/+1
* difftool: Fix '--gui' when diff.guitool is unconfiguredDavid Aguilar2010-03-281-5/+7
* difftool: Add '-x' and as an alias for '--extcmd'David Aguilar2010-01-151-7/+14
* difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar2010-01-091-0/+4
* git-difftool: Add '--gui' for selecting a GUI toolDavid Aguilar2010-01-031-1/+12
* Explain seemingly pointless use of system in difftoolAlex Riesen2009-04-241-0/+6
* Wait for git diff to finish in git difftoolAlex Riesen2009-04-221-1/+2
* difftool: add support for a difftool.prompt config variableDavid Aguilar2009-04-071-3/+12
* difftool: move 'git-difftool' out of contribDavid Aguilar2009-04-071-0/+76
View Lorry Controller Status