summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2016-02-22 15:41:01 +0100
committerCarlos Martín Nieto <cmn@dwim.me>2016-02-22 15:41:01 +0100
commit88ab3be6f52a6711d63266a296b6d569dc299019 (patch)
treeda6a14e9029693e7b1abfbc60350386a6cac886f
parentc8fe6c0975431e92d3dc4569734f30923b64dd18 (diff)
downloadlibgit2-cmn/typo.tar.gz
Fix a few checkout -> rebase typoscmn/typo
-rw-r--r--CHANGELOG.md4
-rw-r--r--include/git2/rebase.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c63f75ece..ec5a0d336 100644
--- 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
index ece8b3664..9b9065ee4 100644
--- 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.