tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2018-05-08	merge-recursive: fix overwriting dirty files involved in renames	Elijah Newren	1	-0/+2
2018-05-08	merge-recursive: add computation of collisions due to dir rename & merging	Elijah Newren	1	-0/+7
2018-05-08	merge-recursive: add get_directory_renames()	Elijah Newren	1	-0/+18
2018-04-11	Revert "Merge branch 'en/rename-directory-detection'"	Junio C Hamano	1	-27/+0
2018-02-27	merge-recursive: fix overwriting dirty files involved in renames	Elijah Newren	1	-0/+2
2018-02-14	merge-recursive: add computation of collisions due to dir rename & merging	Elijah Newren	1	-0/+7
2018-02-14	merge-recursive: add get_directory_renames()	Elijah Newren	1	-0/+18
2017-09-08	merge-recursive: change current file dir string_lists to hashmap	Kevin Willford	1	-2/+1
2016-08-01	merge-recursive: offer an option to retain the output in 'obuf'	Johannes Schindelin	1	-1/+1
2016-06-28	merge-recursive: convert merge_recursive_generic() to object_id	brian m. carlson	1	-3/+3
2016-02-17	merge-recursive: option to disable renames	Felipe Gonçalves Assis	1	-0/+1
2012-10-29	Move try_merge_command and checkout_fast_forward to libgit.a	Nguyễn Thái Ngọc Duy	1	-5/+0
2011-08-14	merge-recursive: Save D/F conflict filenames instead of unlinking them	Elijah Newren	1	-0/+1
2011-03-19	Merge branch 'jk/merge-rename-ux'	Junio C Hamano	1	-0/+2
2011-02-21	merge: enable progress reporting for rename detection	Jeff King	1	-0/+1
2011-02-21	merge: improve inexact rename limit warning	Jeff King	1	-0/+1
2010-12-28	cherry-pick/revert: add support for -X/--strategy-option	Jonathan Nieder	1	-1/+3
2010-10-26	Merge branch 'kb/merge-recursive-rename-threshold'	Junio C Hamano	1	-0/+1
2010-10-26	Merge branch 'jf/merge-ignore-ws'	Junio C Hamano	1	-0/+3
2010-09-29	merge-recursive: option to specify rename threshold	Kevin Ballard	1	-0/+1
2010-09-03	Merge branch 'dg/local-mod-error-messages'	Junio C Hamano	1	-6/+0
2010-09-03	Merge branch 'jn/merge-renormalize'	Junio C Hamano	1	-0/+1
2010-09-03	Move set_porcelain_error_msgs to unpack-trees.c and rename it	Matthieu Moy	1	-6/+0
2010-08-26	merge-recursive --patience	Justin Frankel	1	-0/+1
2010-08-26	merge-recursive: expose merge options for builtin merge	Jonathan Nieder	1	-0/+2
2010-08-11	merge-recursive: porcelain messages for checkout	Diane Gasselin	1	-2/+5
2010-08-11	Turn unpack_trees_options.msgs into an array + enum	Matthieu Moy	1	-2/+2
2010-08-06	merge-trees: let caller decide whether to renormalize	Jonathan Nieder	1	-0/+1
2010-06-21	Merge branch 'gv/portable'	Junio C Hamano	1	-1/+1
2010-05-31	enums: omit trailing comma for portability	Gary V. Vaughan	1	-1/+1
2010-04-01	merge: make function try_merge_command non static	Christian Couder	1	-0/+3
2010-03-20	merge_trees(): add ancestor label parameter for diff3-style output	Jonathan Nieder	1	-0/+1
2010-01-20	Merge branch 'ap/merge-backend-opts'	Junio C Hamano	1	-1/+6
2010-01-17	Make "subtree" part more orthogonal to the rest of merge-recursive.	Junio C Hamano	1	-1/+2
2010-01-17	git merge -X<option>	Avery Pennarun	1	-1/+5
2009-11-29	merge-recursive: make the error-message generation an extern function	Matthieu Moy	1	-0/+3
2008-09-04	merge-recursive: move current_{file,directory}_set to struct merge_options	Miklos Vajna	1	-0/+4
2008-09-04	merge-recursive: move the global obuf to struct merge_options	Miklos Vajna	1	-0/+1
2008-09-03	merge-recursive: move call_depth to struct merge_options	Miklos Vajna	1	-0/+1
2008-08-30	merge-recursive: introduce merge_options	Miklos Vajna	1	-13/+29
2008-08-30	merge-recursive.c: Add more generic merge_recursive_generic()	Stephan Beyer	1	-1/+3
2008-08-30	Split out merge_recursive() to merge-recursive.c	Miklos Vajna	1	-1/+5
2008-02-09	Build-in merge-recursive	Daniel Barkalow	1	-0/+20