diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-10-03 19:02:29 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-10-26 22:59:48 -0400 |
| commit | 18b00406c6427eb8c9d96864448474e1d85017de (patch) | |
| tree | ee02fd12ee4b8f84e5ed53ca59ac771734bba16e /include/git2/rebase.h | |
| parent | 796b03bd4969f170d8e7a7c9edd567f636b58cb3 (diff) | |
| download | libgit2-18b00406c6427eb8c9d96864448474e1d85017de.tar.gz | |
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.
Diffstat (limited to 'include/git2/rebase.h')
| -rw-r--r-- | include/git2/rebase.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/git2/rebase.h b/include/git2/rebase.h index 46fadc67b..24d8fcf71 100644 --- a/include/git2/rebase.h +++ b/include/git2/rebase.h @@ -10,6 +10,7 @@ #include "common.h" #include "types.h" #include "oid.h" +#include "annotated_commit.h" /** * @file git2/rebase.h @@ -133,9 +134,9 @@ GIT_EXTERN(int) git_rebase_init_options( GIT_EXTERN(int) git_rebase_init( git_rebase **out, git_repository *repo, - const git_merge_head *branch, - const git_merge_head *upstream, - const git_merge_head *onto, + const git_annotated_commit *branch, + const git_annotated_commit *upstream, + const git_annotated_commit *onto, const git_signature *signature, const git_rebase_options *opts); |