summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
AgeCommit message (Expand)Author
2010-01-21Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano
2010-01-15difftool: Add '-x' and as an alias for '--extcmd'David Aguilar
2010-01-10Documentation: spell 'git cmd' without dash throughoutThomas Rast
2010-01-10difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar
2010-01-03git-difftool: Add '--gui' for selecting a GUI toolDavid Aguilar
2009-10-28mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon
2009-05-24mergetool--lib: add support for araxis mergeDavid Aguilar
2009-04-08difftool: add support for a difftool.prompt config variableDavid Aguilar
2009-04-08difftool: move 'git-difftool' out of contribDavid Aguilar