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

checkout: better document the baseline_index opt

Browse Source
This commit is contained in:
Edward Thomson 2015-05-11 14:10:24 -04:00
parent 15fdf0548f
commit 1f1f5c639e
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -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.

10
include/git2/checkout.h
View File

@ -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 */