diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-07-22 10:40:23 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2014-07-22 10:40:23 -0400 |
| commit | 0ba4dca52625b54d6b741bd10dce5ef76ebbf1b8 (patch) | |
| tree | dfc1be8e3b7b1516eb7103aaecca7644cfc17d50 /include | |
| parent | 091165c53b2bcd5d41fb71d43ed5a23a3d96bf5d (diff) | |
| download | libgit2-0ba4dca52625b54d6b741bd10dce5ef76ebbf1b8.tar.gz | |
git_cherry_pick -> git_cherrypick
Diffstat (limited to 'include')
| -rw-r--r-- | include/git2/cherrypick.h | 30 | ||||
| -rw-r--r-- | include/git2/repository.h | 2 |
2 files changed, 16 insertions, 16 deletions
diff --git a/include/git2/cherrypick.h b/include/git2/cherrypick.h index 9eccb0af9..dea67c1ff 100644 --- a/include/git2/cherrypick.h +++ b/include/git2/cherrypick.h @@ -28,21 +28,21 @@ typedef struct { git_merge_options merge_opts; git_checkout_options checkout_opts; -} git_cherry_pick_options; +} git_cherrypick_options; -#define GIT_CHERRY_PICK_OPTIONS_VERSION 1 -#define GIT_CHERRY_PICK_OPTIONS_INIT {GIT_CHERRY_PICK_OPTIONS_VERSION, 0, GIT_MERGE_OPTIONS_INIT, GIT_CHECKOUT_OPTIONS_INIT} +#define GIT_CHERRYPICK_OPTIONS_VERSION 1 +#define GIT_CHERRYPICK_OPTIONS_INIT {GIT_CHERRYPICK_OPTIONS_VERSION, 0, GIT_MERGE_OPTIONS_INIT, GIT_CHECKOUT_OPTIONS_INIT} /** - * Initializes a `git_cherry_pick_options` with default values. Equivalent to - * creating an instance with GIT_CHERRY_PICK_OPTIONS_INIT. + * Initializes a `git_cherrypick_options` with default values. Equivalent to + * creating an instance with GIT_CHERRYPICK_OPTIONS_INIT. * - * @param opts the `git_cherry_pick_options` struct to initialize - * @param version Version of struct; pass `GIT_CHERRY_PICK_OPTIONS_VERSION` + * @param opts the `git_cherrypick_options` struct to initialize + * @param version Version of struct; pass `GIT_CHERRYPICK_OPTIONS_VERSION` * @return Zero on success; -1 on failure. */ -GIT_EXTERN(int) git_cherry_pick_init_options( - git_cherry_pick_options *opts, +GIT_EXTERN(int) git_cherrypick_init_options( + git_cherrypick_options *opts, unsigned int version); /** @@ -53,16 +53,16 @@ GIT_EXTERN(int) git_cherry_pick_init_options( * * @param out pointer to store the index result in * @param repo the repository that contains the given commits - * @param cherry_pick_commit the commit to cherry-pick + * @param cherrypick_commit the commit to cherry-pick * @param our_commit the commit to revert against (eg, HEAD) * @param mainline the parent of the revert commit, if it is a merge * @param merge_options the merge options (or null for defaults) * @return zero on success, -1 on failure. */ -GIT_EXTERN(int) git_cherry_pick_commit( +GIT_EXTERN(int) git_cherrypick_commit( git_index **out, git_repository *repo, - git_commit *cherry_pick_commit, + git_commit *cherrypick_commit, git_commit *our_commit, unsigned int mainline, const git_merge_options *merge_options); @@ -72,13 +72,13 @@ GIT_EXTERN(int) git_cherry_pick_commit( * * @param repo the repository to cherry-pick * @param commit the commit to cherry-pick - * @param cherry_pick_options the cherry-pick options (or null for defaults) + * @param cherrypick_options the cherry-pick options (or null for defaults) * @return zero on success, -1 on failure. */ -GIT_EXTERN(int) git_cherry_pick( +GIT_EXTERN(int) git_cherrypick( git_repository *repo, git_commit *commit, - const git_cherry_pick_options *cherry_pick_options); + const git_cherrypick_options *cherrypick_options); /** @} */ GIT_END_DECL diff --git a/include/git2/repository.h b/include/git2/repository.h index 6a8ff4545..18e515cb0 100644 --- a/include/git2/repository.h +++ b/include/git2/repository.h @@ -662,7 +662,7 @@ typedef enum { GIT_REPOSITORY_STATE_NONE, GIT_REPOSITORY_STATE_MERGE, GIT_REPOSITORY_STATE_REVERT, - GIT_REPOSITORY_STATE_CHERRY_PICK, + GIT_REPOSITORY_STATE_CHERRYPICK, GIT_REPOSITORY_STATE_BISECT, GIT_REPOSITORY_STATE_REBASE, GIT_REPOSITORY_STATE_REBASE_INTERACTIVE, |