summaryrefslogtreecommitdiff
path: root/contrib/difftool
Commit message (Expand)AuthorAgeFilesLines
* difftool: add a -y shortcut for --no-promptDavid Aguilar2009-04-072-25/+17
* difftool: use perl built-ins when testing for msysDavid Aguilar2009-04-071-2/+5
* difftool: remove the backup file featureDavid Aguilar2009-04-071-33/+1
* difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiffDavid Aguilar2009-04-071-7/+3
* git-mergetool/difftool: make (g)vimdiff workable under WindowsMarkus Heidelberg2009-04-071-2/+8
* contrib/difftool: use a separate config namespace for difftool commandsDavid Aguilar2009-03-113-23/+32
* contrib/difftool: Don't repeat merge tool candidatesDavid Aguilar2009-01-311-19/+12
* contrib/difftool: add support for KompareMarkus Heidelberg2009-01-312-7/+12
* contrib/difftool: remove distracting 'echo' in the SIGINT handlerMarkus Heidelberg2009-01-191-1/+0
* contrib/difftool: change trap condition from SIGINT to INTMarkus Heidelberg2009-01-191-1/+1
* difftool: put the cursor on the editable file for VimDavid Aguilar2009-01-181-2/+6
* difftool: fix documentation problemsDavid Aguilar2009-01-182-13/+12
* contrib: add 'git difftool' for launching common merge toolsDavid Aguilar2009-01-173-0/+418