Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
305c4f95
Commit
305c4f95
authored
Feb 22, 2016
by
Edward Thomson
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3627 from libgit2/cmn/typo
Fix a few checkout -> rebase typos
parents
c8fe6c09
88ab3be6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
CHANGELOG.md
+2
-2
include/git2/rebase.h
+1
-1
No files found.
CHANGELOG.md
View file @
305c4f95
...
...
@@ -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.
...
...
include/git2/rebase.h
View file @
305c4f95
...
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment