git.ipfire.org Git - thirdparty/git.git/history - Documentation/merge-strategies.txt

]> git.ipfire.org Git - thirdparty/git.git/history - Documentation/merge-strategies.txt

2005-12-08	Junio C Hamano	Documentation: recursive is the default strategy these...	blob \| commitdiff \| raw
2005-12-07	Junio C Hamano	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2005-11-29	Junio C Hamano	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2005-11-28	Junio C Hamano	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2005-11-27	Junio C Hamano	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2005-11-22	Junio C Hamano	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2005-11-20	Junio C Hamano	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2005-11-19	Junio C Hamano	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2005-11-06	Jon Loeliger	Refactor merge strategies into separate includable...	blob \| commitdiff \| raw \| diff to current

Unnamed repository; edit this file 'description' to name the repository.