delta/libgit2.git/src/annotated_commit.h, branch cmn/treebuilder-submodule github.com: libgit2/libgit2.git merge: use annotated commits for recursion 2015-11-25T20:38:16+00:00 Edward Thomson ethomson@edwardthomson.com 2015-11-11T05:21:26+00:00 76ade3a0b87e279935eba54be2485105396edb7f 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. 
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.
merge: merge annotated commits instead of regular commits 2015-11-25T20:38:03+00:00 Edward Thomson ethomson@edwardthomson.com 2015-11-09T18:01:48+00:00 7730fe8e9cda1e160bff1e78dfa2a898799d4365 






merge: octopus merge common ancestors when >2
2015-11-25T20:37:57+00:00

Edward Thomson
ethomson@edwardthomson.com

2015-10-28T15:00:55+00:00

3f2bb387a43185991d7e077fa5e6c0bb467f2abc

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.





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.







s/git_merge_head/git_annotated_commit
2014-10-27T02:59:48+00:00

Edward Thomson
ethomson@microsoft.com

2014-10-03T23:02:29+00:00

18b00406c6427eb8c9d96864448474e1d85017de

Rename git_merge_head to git_annotated_commit, as it becomes used
in more operations than just merge.





Rename git_merge_head to git_annotated_commit, as it becomes used
in more operations than just merge.