org/kernel/git.git - forked from git/git

	Commit message (Expand)	Author	Age
*	Merge branch 'ss/mergetool--lib'	Junio C Hamano	2011-03-19
\|\
\| *	mergetool--lib: Add Beyond Compare 3 as a tool	Sebastian Schuberth	2011-02-28
\| *	mergetool--lib: Sort tools alphabetically for easier lookup	Sebastian Schuberth	2011-02-28
* \|	doc: drop author/documentation sections from most pages	Jeff King	2011-03-11
\|/
*	Merge branch 'maint'	Junio C Hamano	2010-12-16
\|\
\| *	difftool: provide basename to external tools	Michael J Gruber	2010-12-16
\| *	git-difftool.txt: correct the description of $BASE and describe $MERGED	Michael J Gruber	2010-12-16
* \|	docs: clarify git diff modes of operation	Jeff King	2010-11-05
* \|	diff,difftool: Don't use the {0,2} notation in usage strings	Štěpán Němec	2010-11-05
\|/
*	Merge remote branch 'remotes/trast-doc/for-next'	Junio C Hamano	2010-01-20
\|\
\| *	Documentation: spell 'git cmd' without dash throughout	Thomas Rast	2010-01-10
* \|	difftool: Add '-x' and as an alias for '--extcmd'	David Aguilar	2010-01-15
* \|	difftool: Allow specifying unconfigured commands with --extcmd	David Aguilar	2010-01-09
* \|	git-difftool: Add '--gui' for selecting a GUI tool	David Aguilar	2010-01-03
\|/
*	mergetool--lib: add p4merge as a pre-configured mergetool option	Scott Chacon	2009-10-28
*	mergetool--lib: add support for araxis merge	David Aguilar	2009-05-24
*	difftool: add support for a difftool.prompt config variable	David Aguilar	2009-04-07
*	difftool: move 'git-difftool' out of contrib	David Aguilar	2009-04-07