Commit 1f1f5c63 by Edward Thomson

checkout: better document the `baseline_index` opt

parent 15fdf054
...@@ -34,6 +34,9 @@ v0.22 + 1 ...@@ -34,6 +34,9 @@ v0.22 + 1
* On Mac OS X, we now use SecureTransport to provide the cryptographic * On Mac OS X, we now use SecureTransport to provide the cryptographic
support for HTTPS connections insead of OpenSSL. support for HTTPS connections insead of OpenSSL.
* Checkout can now accept an index for the baseline computations via the
`baseline_index` member.
### API additions ### API additions
* The `git_merge_options` gained a `file_flags` member. * The `git_merge_options` gained a `file_flags` member.
......
...@@ -272,7 +272,15 @@ typedef struct git_checkout_options { ...@@ -272,7 +272,15 @@ typedef struct git_checkout_options {
*/ */
git_strarray paths; 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. */ git_index *baseline_index; /**< expected content of workdir, expressed as an index. */
const char *target_directory; /**< alternative checkout path to workdir */ const char *target_directory; /**< alternative checkout path to workdir */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment