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

	Commit message (Expand)	Author	Age
*	mergetools: stop setting $status in merge_cmd()	David Aguilar	2014-11-21
*	Merge branch 'oc/mergetools-beyondcompare'	Junio C Hamano	2014-10-29
\|\
\| *	mergetool: rename bc3 to bc	Junio C Hamano	2014-10-21
* \|	mergetools/meld: make usage of `--output` configurable and more robust	David Aguilar	2014-10-16
\|/
*	mergetools: add vimdiff3 mode	Felipe Contreras	2014-04-22
*	mergetools/diffmerge: support DiffMerge as a git mergetool	Stefan Saasen	2013-10-13
*	Sync with v1.8.2.3	Junio C Hamano	2013-05-09
\|\
\| *	mergetools/kdiff3: do not use --auto when diffing	David Aguilar	2013-05-09
* \|	mergetools/p4merge: create a base if none available	Kevin Bracey	2013-03-13
* \|	mergetools/p4merge: swap LOCAL and REMOTE	Kevin Bracey	2013-03-13
\|/
*	Merge branch 'da/p4merge-mktemp-fix'	Junio C Hamano	2013-02-14
\|\
\| *	p4merge: fix printf usage	David Aguilar	2013-02-10
* \|	Merge branch 'ss/mergetools-tortoise'	Junio C Hamano	2013-02-07
\|\ \
\| * \|	mergetools: teach tortoisemerge to handle filenames with SP correctly	Sven Strickroth	2013-02-01
\| * \|	mergetools: support TortoiseGitMerge	Sven Strickroth	2013-01-26
* \| \|	Merge branch 'jk/mergetool'	Junio C Hamano	2013-02-07
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	mergetools: simplify how we handle "vim" and "defaults"	David Aguilar	2013-01-28
\| * \|	mergetools/vim: remove redundant diff command	David Aguilar	2013-01-27
* \| \|	mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder	David Aguilar	2012-12-26
\| \|/ \|/\|
* \|	Merge branch 'da/mergetools-p4'	Jeff King	2012-10-25
\|\ \ \| \|/ \|/\|
\| *	mergetools/p4merge: Handle "/dev/null"	David Aguilar	2012-10-11
* \|	Merge branch 'da/mergetool-custom'	Junio C Hamano	2012-10-01
\|\ \
\| * \|	mergetool--lib: Allow custom commands to override built-ins	David Aguilar	2012-09-25
\| \|/
* \|	Add Code Compare v2.80.4 as a merge / diff tool for Windows	Sebastian Schuberth	2012-08-10
\|/
*	mergetools: add a plug-in to support DeltaWalker	Tim Henigan	2012-03-05
*	Merge branch 'jn/ancient-meld-support'	Junio C Hamano	2012-02-14
\|\
\| *	mergetools/meld: Use --help output to detect --output support	Jonathan Nieder	2012-02-10
* \|	mergetools: use the correct tool for Beyond Compare 3 on Windows	Pat Thoyts	2011-10-15
\|/
*	mergetools/meld: Use '--output' when available	David Aguilar	2011-08-19
*	mergetool--lib: Refactor tools into separate files	David Aguilar	2011-08-19