]> git.proxmox.com Git - libgit2.git/commit
projects / libgit2.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 86c8d02) | patch
merge: build virtual base of multiple merge bases
authorEdward Thomson <ethomson@edwardthomson.com>
Mon, 26 Oct 2015 14:37:58 +0000 (10:37 -0400)
committerEdward Thomson <ethomson@microsoft.com>
Wed, 25 Nov 2015 20:37:17 +0000 (15:37 -0500)
commit75dee59c94d39b308529d45dfb993b25d2e9a5f0
tree847026b4cd09eff6c3c69f441946250b6605eec4tree
parent86c8d02c071d3713e1c9f0b95d9f4599108d2c29commit | diff
merge: build virtual base of multiple merge bases

When the commits to merge have multiple common ancestors, build a
"virtual" base tree by merging the common ancestors.
src/merge.c diff | blob | blame | history
The git library used in some Proxmox tool chains