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

	Commit message (Expand)	Author	Age
*	Merge branch 'jc/ignore-cr-at-eol'	Junio C Hamano	2017-11-27
\|\
\| *	diff: --ignore-cr-at-eol	Junio C Hamano	2017-11-08
* \|	merge-strategies: avoid implying that "-s theirs" exists	Junio C Hamano	2017-09-25
\|/
*	merge-strategies.txt: fix typo	Felipe Gonçalves Assis	2016-02-22
*	merge-recursive: more consistent interface	Felipe Gonçalves Assis	2016-02-17
*	merge-recursive: option to disable renames	Felipe Gonçalves Assis	2016-02-17
*	Merge branch 'rr/doc-merge-strategies'	Junio C Hamano	2014-03-25
\|\
\| *	Documentation/merge-strategies: avoid hyphenated commands	Ramkumar Ramachandra	2014-03-17
* \|	docs/merge-strategies: remove hyphen from mis-merges	Albert L. Lash, IV	2014-02-11
* \|	Documentation: document pitfalls with 3-way merge	brian m. carlson	2013-12-09
\|/
*	git-merge(1): document diff-algorithm option to merge-recursive	John Keeping	2013-04-05
*	merge: teach -Xours/-Xtheirs to binary ll-merge driver	Junio C Hamano	2012-09-08
*	Merge branch 'kb/merge-recursive-rename-threshold'	Junio C Hamano	2010-10-26
\|\
\| *	merge-recursive: option to specify rename threshold	Kevin Ballard	2010-09-29
* \|	Merge branch 'jf/merge-ignore-ws'	Junio C Hamano	2010-10-26
\|\ \ \| \|/
\| *	merge-recursive: options to ignore whitespace changes	Justin Frankel	2010-08-27
\| *	merge-recursive --patience	Justin Frankel	2010-08-26
* \|	Use angles for placeholders consistently	Štěpán Němec	2010-10-08
\|/
*	merge-recursive --renormalize	Jonathan Nieder	2010-08-06
*	Document that merge strategies can now take their own options	Junio C Hamano	2010-01-17
*	Documentation: clarify 'ours' merge strategy	Thomas Rast	2009-11-15
*	Grammar fixes to "merge" and "patch-id" docs	Wincent Colaiuta	2009-03-25
*	Documentation/git-merge: document subtree strategy.	Miklos Vajna	2008-03-19
*	Documentation: recursive is the default strategy these days.	Junio C Hamano	2005-12-08
*	Refactor merge strategies into separate includable file.	Jon Loeliger	2005-11-06