From 88ab3be6f52a6711d63266a296b6d569dc299019 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Mon, 22 Feb 2016 15:41:01 +0100 Subject: [PATCH] Fix a few checkout -> rebase typos --- CHANGELOG.md | 4 ++-- include/git2/rebase.h | 2 +- 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.