git_checkout_opts -> git_checkout_options

1 files changed, 14 insertions, 14 deletions

diff --git a/include/git2/checkout.h b/include/git2/checkout.h
index 702e088d9..69addb7d9 100644
--- a/include/git2/checkout.h
+++ b/include/git2/checkout.h
@@ -225,12 +225,12 @@ typedef void (*git_checkout_progress_cb)(
 /**
  * Checkout options structure
  *
- * Zero out for defaults.  Initialize with `GIT_CHECKOUT_OPTS_INIT` macro to
+ * Zero out for defaults.  Initialize with `GIT_CHECKOUT_OPTIONS_INIT` macro to
  * correctly set the `version` field.  E.g.
  *
- *		git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;
+ *		git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
  */
-typedef struct git_checkout_opts {
+typedef struct git_checkout_options {
 	unsigned int version;
 
 	unsigned int checkout_strategy; /** default will be a dry run */
@@ -261,22 +261,22 @@ typedef struct git_checkout_opts {
 	const char *ancestor_label; /** the name of the common ancestor side of conflicts */
 	const char *our_label; /** the name of the "our" side of conflicts */
 	const char *their_label; /** the name of the "their" side of conflicts */
-} git_checkout_opts;
+} git_checkout_options;
 
-#define GIT_CHECKOUT_OPTS_VERSION 1
-#define GIT_CHECKOUT_OPTS_INIT {GIT_CHECKOUT_OPTS_VERSION}
+#define GIT_CHECKOUT_OPTIONS_VERSION 1
+#define GIT_CHECKOUT_OPTIONS_INIT {GIT_CHECKOUT_OPTIONS_VERSION}
 
 /**
-* Initializes a `git_checkout_opts` with default values. Equivalent to
-* creating an instance with GIT_CHECKOUT_OPTS_INIT.
+* Initializes a `git_checkout_options` with default values. Equivalent to
+* creating an instance with GIT_CHECKOUT_OPTIONS_INIT.
 *
-* @param opts the `git_checkout_opts` instance to initialize.
+* @param opts the `git_checkout_options` instance to initialize.
 * @param version the version of the struct; you should pass
-* `GIT_CHECKOUT_OPTS_VERSION` here.
+* `GIT_CHECKOUT_OPTIONS_VERSION` here.
 * @return Zero on success; -1 on failure.
 */
 GIT_EXTERN(int) git_checkout_init_opts(
-	git_checkout_opts* opts,
+	git_checkout_options* opts,
 	int version);
 
 /**
@@ -291,7 +291,7 @@ GIT_EXTERN(int) git_checkout_init_opts(
  */
 GIT_EXTERN(int) git_checkout_head(
 	git_repository *repo,
-	const git_checkout_opts *opts);
+	const git_checkout_options *opts);
 
 /**
  * Updates files in the working tree to match the content of the index.
@@ -305,7 +305,7 @@ GIT_EXTERN(int) git_checkout_head(
 GIT_EXTERN(int) git_checkout_index(
 	git_repository *repo,
 	git_index *index,
-	const git_checkout_opts *opts);
+	const git_checkout_options *opts);
 
 /**
  * Updates files in the index and working tree to match the content of the
@@ -321,7 +321,7 @@ GIT_EXTERN(int) git_checkout_index(
 GIT_EXTERN(int) git_checkout_tree(
 	git_repository *repo,
 	const git_object *treeish,
-	const git_checkout_opts *opts);
+	const git_checkout_options *opts);
 
 /** @} */
 GIT_END_DECL