aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
Commit message (Expand)AuthorAge
* Merge branch 'ss/mergetool--lib'Junio C Hamano2011-03-19
|\
| * mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth2011-02-28
| * mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth2011-02-28
* | doc: drop author/documentation sections from most pagesJeff King2011-03-11
|/
* Merge branch 'maint'Junio C Hamano2010-12-16
|\
| * difftool: provide basename to external toolsMichael J Gruber2010-12-16
| * git-difftool.txt: correct the description of $BASE and describe $MERGEDMichael J Gruber2010-12-16
* | docs: clarify git diff modes of operationJeff King2010-11-05
* | diff,difftool: Don't use the {0,2} notation in usage stringsŠtěpán Němec2010-11-05
|/
* Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano2010-01-20
|\
| * Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-10
* | difftool: Add '-x' and as an alias for '--extcmd'David Aguilar2010-01-15
* | difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar2010-01-09
* | git-difftool: Add '--gui' for selecting a GUI toolDavid Aguilar2010-01-03
|/
* mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon2009-10-28
* mergetool--lib: add support for araxis mergeDavid Aguilar2009-05-24
* difftool: add support for a difftool.prompt config variableDavid Aguilar2009-04-07
* difftool: move 'git-difftool' out of contribDavid Aguilar2009-04-07