Merge pull request libgit2#3627 from libgit2/cmn/typo

Edward Thomson · Edward Thomson · commit 305c4f95ce36 · 2016-02-22T10:16:49.000-05:00
Fix a few checkout -&gt; rebase typos
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -328,8 +328,8 @@ v0.23
 
 * `git_rebase_options` now contains a `git_checkout_options` struct
   that will be used for functions that modify the working directory,
-  namely `git_checkout_init`, `git_checkout_next` and
-  `git_checkout_abort`.  As a result, `git_rebase_open` now also takes
+  namely `git_rebase_init`, `git_rebase_next` and
+  `git_rebase_abort`.  As a result, `git_rebase_open` now also takes
   a `git_rebase_options` and only the `git_rebase_init` and
   `git_rebase_open` functions take a `git_rebase_options`, where they
   will persist the options to subsequent `git_rebase` calls.
diff --git a/include/git2/rebase.h b/include/git2/rebase.h
@@ -64,7 +64,7 @@ typedef struct {
 
 	/**
 	 * Options to control how files are written during `git_rebase_init`,
-	 * `git_checkout_next` and `git_checkout_abort`.  Note that a minimum
+	 * `git_rebase_next` and `git_rebase_abort`.  Note that a minimum
 	 * strategy of `GIT_CHECKOUT_SAFE` is defaulted in `init` and `next`,
 	 * and a minimum strategy of `GIT_CHECKOUT_FORCE` is defaulted in
 	 * `abort` to match git semantics.
