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
1f1f5c63
Commit
1f1f5c63
authored
May 11, 2015
by
Edward Thomson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
checkout: better document the `baseline_index` opt
parent
15fdf054
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletions
+12
-1
CHANGELOG.md
+3
-0
include/git2/checkout.h
+9
-1
No files found.
CHANGELOG.md
View file @
1f1f5c63
...
...
@@ -34,6 +34,9 @@ v0.22 + 1
*
On Mac OS X, we now use SecureTransport to provide the cryptographic
support for HTTPS connections insead of OpenSSL.
*
Checkout can now accept an index for the baseline computations via the
`baseline_index`
member.
### API additions
*
The
`git_merge_options`
gained a
`file_flags`
member.
...
...
include/git2/checkout.h
View file @
1f1f5c63
...
...
@@ -272,7 +272,15 @@ typedef struct git_checkout_options {
*/
git_strarray
paths
;
git_tree
*
baseline
;
/**< expected content of workdir, defaults to HEAD */
/** The expected content of the working directory; defaults to HEAD.
* If the working directory does not match this baseline information,
* that will produce a checkout conflict.
*/
git_tree
*
baseline
;
/** Like `baseline` above, though expressed as an index. This
* option overrides `baseline`.
*/
git_index
*
baseline_index
;
/**< expected content of workdir, expressed as an index. */
const
char
*
target_directory
;
/**< alternative checkout path to workdir */
...
...
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