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

]> git.proxmox.com Git - libgit2.git/commit - src/merge.h

author	Edward Thomson <ethomson@microsoft.com>
	Fri, 3 Oct 2014 23:02:29 +0000 (19:02 -0400)
committer	Edward Thomson <ethomson@microsoft.com>
	Mon, 27 Oct 2014 02:59:48 +0000 (22:59 -0400)
commit	18b00406c6427eb8c9d96864448474e1d85017de
tree	ee02fd12ee4b8f84e5ed53ca59ac771734bba16e	tree
parent	796b03bd4969f170d8e7a7c9edd567f636b58cb3	commit \| diff

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.

21 files changed:

include/git2.h		diff \| blob \| blame \| history
include/git2/annotated_commit.h	[new file with mode: 0644]	blob
include/git2/merge.h		diff \| blob \| blame \| history
include/git2/rebase.h		diff \| blob \| blame \| history
include/git2/types.h		diff \| blob \| blame \| history
src/annotated_commit.c	[new file with mode: 0644]	blob
src/annotated_commit.h	[new file with mode: 0644]	blob
src/merge.c		diff \| blob \| blame \| history
src/merge.h		diff \| blob \| blame \| history
src/rebase.c		diff \| blob \| blame \| history
tests/merge/merge_helpers.c		diff \| blob \| blame \| history
tests/merge/workdir/analysis.c		diff \| blob \| blame \| history
tests/merge/workdir/dirty.c		diff \| blob \| blame \| history
tests/merge/workdir/setup.c		diff \| blob \| blame \| history
tests/merge/workdir/simple.c		diff \| blob \| blame \| history
tests/merge/workdir/submodules.c		diff \| blob \| blame \| history
tests/merge/workdir/trivial.c		diff \| blob \| blame \| history
tests/rebase/abort.c		diff \| blob \| blame \| history
tests/rebase/iterator.c		diff \| blob \| blame \| history
tests/rebase/merge.c		diff \| blob \| blame \| history
tests/rebase/setup.c		diff \| blob \| blame \| history

The git library used in some Proxmox tool chains