diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-03-11 22:47:39 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-03-20 09:25:08 -0700 |
| commit | 5aa2ac6de1622308884fd542f7b29e6810a0e98e (patch) | |
| tree | 350898e99181e7b2c7d6db4da667d384ef90ef49 /include/git2/revert.h | |
| parent | 02105a27f01509ce4e641487cae040662ee477a2 (diff) | |
| download | libgit2-5aa2ac6de1622308884fd542f7b29e6810a0e98e.tar.gz | |
Update git_merge_tree_opts to git_merge_options
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. |