git.proxmox.com Git - libgit2.git/commit

]> git.proxmox.com Git - libgit2.git/commit - src/annotated_commit.c

author	Edward Thomson <ethomson@edwardthomson.com>
	Wed, 11 Nov 2015 05:21:26 +0000 (21:21 -0800)
committer	Edward Thomson <ethomson@microsoft.com>
	Wed, 25 Nov 2015 20:38:16 +0000 (15:38 -0500)
commit	76ade3a0b87e279935eba54be2485105396edb7f
tree	9a8310a2645ccca8074d2357ab07baf1bb9ffb87	tree
parent	7730fe8e9cda1e160bff1e78dfa2a898799d4365	commit \| diff

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.

src/annotated_commit.c		diff \| blob \| blame \| history
src/annotated_commit.h		diff \| blob \| blame \| history
src/merge.c		diff \| blob \| blame \| history

The git library used in some Proxmox tool chains

RSS Atom