4 Commits

Author	SHA1	Message	Date
Edward Thomson	76ade3a0b8	merge: use annotated commits for recursion ... Use annotated commits to act as our virtual bases, instead of regular commits, to avoid polluting the odb with virtual base commits and trees. Instead, build an annotated commit with an index and pointers to the commits that it was merged from.	2015-11-25 15:38:16 -05:00
Edward Thomson	7730fe8e9c	merge: merge annotated commits instead of regular commits	2015-11-25 15:38:03 -05:00
Edward Thomson	3f2bb387a4	merge: octopus merge common ancestors when >2 ... When there are more than two common ancestors, continue merging the virtual base with the additional common ancestors, effectively octopus merging a new virtual base.	2015-11-25 15:37:57 -05:00
Edward Thomson	18b00406c6	s/git_merge_head/git_annotated_commit ... Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.	2014-10-26 22:59:48 -04:00