summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
Commit message (Expand)AuthorAgeFilesLines
* documentation fix: git difftool uses diff tools, not merge tools.Thomas Hochstein2011-11-211-1/+1
* Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk2011-07-061-0/+1
* Merge branch 'ss/mergetool--lib'Junio C Hamano2011-03-191-2/+2
|\
| * mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth2011-02-281-1/+1
| * mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth2011-02-281-2/+2
* | doc: drop author/documentation sections from most pagesJeff King2011-03-111-9/+0
|/
* Merge branch 'maint'Junio C Hamano2010-12-161-2/+4
|\
| * difftool: provide basename to external toolsMichael J Gruber2010-12-161-0/+1
| * git-difftool.txt: correct the description of $BASE and describe $MERGEDMichael J Gruber2010-12-161-2/+3
* | docs: clarify git diff modes of operationJeff King2010-11-051-1/+2
* | diff,difftool: Don't use the {0,2} notation in usage stringsŠtěpán Němec2010-11-051-1/+1
|/
* 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