git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	git-merge(1): document diff-algorithm option to merge-recursive	John Keeping	2013-04-05	1	-0/+6
*	merge: teach -Xours/-Xtheirs to binary ll-merge driver	Junio C Hamano	2012-09-09	1	-1/+2
*	Merge branch 'kb/merge-recursive-rename-threshold'	Junio C Hamano	2010-10-27	1	-0/+4
\|\
\| *	merge-recursive: option to specify rename threshold	Kevin Ballard	2010-09-29	1	-0/+4
* \|	Merge branch 'jf/merge-ignore-ws'	Junio C Hamano	2010-10-27	1	-0/+22
\|\\|
\| *	merge-recursive: options to ignore whitespace changes	Justin Frankel	2010-08-27	1	-0/+15
\| *	merge-recursive --patience	Justin Frankel	2010-08-26	1	-0/+7
* \|	Use angles for placeholders consistently	Štěpán Němec	2010-10-08	1	-1/+1
\|/
*	merge-recursive --renormalize	Jonathan Nieder	2010-08-06	1	-0/+12
*	Document that merge strategies can now take their own options	Junio C Hamano	2010-01-18	1	-1/+28
*	Documentation: clarify 'ours' merge strategy	Thomas Rast	2009-11-15	1	-2/+3
*	Grammar fixes to "merge" and "patch-id" docs	Wincent Colaiuta	2009-03-26	1	-7/+7
*	Documentation/git-merge: document subtree strategy.	Miklos Vajna	2008-03-19	1	-0/+7
*	Documentation: recursive is the default strategy these days.	Junio C Hamano	2005-12-08	1	-5/+5
*	Refactor merge strategies into separate includable file.	Jon Loeliger	2005-11-06	1	-0/+35