proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-27 06:10:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3627 from libgit2/cmn/typo

Browse Source 
Fix a few checkout -> rebase typos
This commit is contained in:
Edward Thomson 2016-02-22 10:16:49 -05:00
commit 305c4f95ce
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -328,8 +328,8 @@ v0.23
* `git_rebase_options` now contains a `git_checkout_options` struct * `git_rebase_options` now contains a `git_checkout_options` struct
that will be used for functions that modify the working directory, that will be used for functions that modify the working directory,
namely `git_checkout_init`, `git_checkout_next` and namely `git_rebase_init`, `git_rebase_next` and
`git_checkout_abort`. As a result, `git_rebase_open` now also takes `git_rebase_abort`. As a result, `git_rebase_open` now also takes
a `git_rebase_options` and only the `git_rebase_init` and a `git_rebase_options` and only the `git_rebase_init` and
`git_rebase_open` functions take a `git_rebase_options`, where they `git_rebase_open` functions take a `git_rebase_options`, where they
will persist the options to subsequent `git_rebase` calls. will persist the options to subsequent `git_rebase` calls.

2
include/git2/rebase.h
View File

@ -64,7 +64,7 @@ typedef struct {
/** /**
* Options to control how files are written during `git_rebase_init`, * 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`, * strategy of `GIT_CHECKOUT_SAFE` is defaulted in `init` and `next`,
* and a minimum strategy of `GIT_CHECKOUT_FORCE` is defaulted in * and a minimum strategy of `GIT_CHECKOUT_FORCE` is defaulted in
* `abort` to match git semantics. * `abort` to match git semantics.