summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano2010-01-201-8/+8
|\
| * Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-101-8/+8
* | difftool: Add '-x' and as an alias for '--extcmd'David Aguilar2010-01-151-1/+2
* | difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar2010-01-091-0/+5
* | git-difftool: Add '--gui' for selecting a GUI toolDavid Aguilar2010-01-031-0/+9
|/
* mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon2009-10-281-1/+1
* mergetool--lib: add support for araxis mergeDavid Aguilar2009-05-241-1/+1
* difftool: add support for a difftool.prompt config variableDavid Aguilar2009-04-071-1/+9
* difftool: move 'git-difftool' out of contribDavid Aguilar2009-04-071-0/+97