diff options
| author | Vicent Marti <vicent@github.com> | 2014-03-24 18:09:13 +0100 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-03-24 18:09:13 +0100 |
| commit | 85a41fc4bf148dc954fa8124b61355ee648c40ba (patch) | |
| tree | 477ab7f38edf350dff922e9b21612f4d71ae3c76 /include/git2/revert.h | |
| parent | f57cc63811db2717e9ba42e720a75f71557f9451 (diff) | |
| parent | 58c2b1c4218a2f90ee2745687f2e17670bde0b1b (diff) | |
| download | libgit2-85a41fc4bf148dc954fa8124b61355ee648c40ba.tar.gz | |
Merge pull request #2183 from ethomson/merge_refactor
Refactor the `git_merge` API
Diffstat (limited to 'include/git2/revert.h')
| -rw-r--r-- | include/git2/revert.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/git2/revert.h b/include/git2/revert.h index 3f48c4e4b..3a6beb6b8 100644 --- a/include/git2/revert.h +++ b/include/git2/revert.h @@ -26,12 +26,12 @@ typedef struct { /** For merge commits, the "mainline" is treated as the parent. */ unsigned int mainline; - git_merge_tree_opts merge_tree_opts; + git_merge_options merge_opts; git_checkout_options checkout_opts; } git_revert_options; #define GIT_REVERT_OPTIONS_VERSION 1 -#define GIT_REVERT_OPTIONS_INIT {GIT_REVERT_OPTIONS_VERSION, 0, GIT_MERGE_TREE_OPTS_INIT, GIT_CHECKOUT_OPTIONS_INIT} +#define GIT_REVERT_OPTIONS_INIT {GIT_REVERT_OPTIONS_VERSION, 0, GIT_MERGE_OPTIONS_INIT, GIT_CHECKOUT_OPTIONS_INIT} /** * Initializes a `git_revert_options` with default values. Equivalent to @@ -66,7 +66,7 @@ int git_revert_commit( git_commit *revert_commit, git_commit *our_commit, unsigned int mainline, - const git_merge_tree_opts *merge_tree_opts); + const git_merge_options *merge_options); /** * Reverts the given commit, producing changes in the working directory. |