summaryrefslogtreecommitdiff
path: root/include/git2/checkout.h
diff options
context:
space:
mode:
authorVicent Martí <vicent@github.com>2013-10-16 13:51:24 -0700
committerVicent Martí <vicent@github.com>2013-10-16 13:51:24 -0700
commitb2c9e41ae43dbd6674abd38a17d87d690c80d43e (patch)
treee45734363923b2dbb240a93a027fe2abf6fa8db3 /include/git2/checkout.h
parent2c2b0ebb4ab646a9f6a03d9bda176634e609b279 (diff)
parentc929d6b727cb35a681152ae2c7d6dfbaf971f829 (diff)
downloadlibgit2-b2c9e41ae43dbd6674abd38a17d87d690c80d43e.tar.gz
Merge pull request #1702 from ethomson/checkout_merge
Checkout merge
Diffstat (limited to 'include/git2/checkout.h')
-rw-r--r--include/git2/checkout.h17
1 files changed, 10 insertions, 7 deletions
diff --git a/include/git2/checkout.h b/include/git2/checkout.h
index 844f0a9e2..3793a4f18 100644
--- a/include/git2/checkout.h
+++ b/include/git2/checkout.h
@@ -131,6 +131,13 @@ typedef enum {
/** Don't refresh index/config/etc before doing checkout */
GIT_CHECKOUT_NO_REFRESH = (1u << 9),
+ /** Allow checkout to skip unmerged files */
+ GIT_CHECKOUT_SKIP_UNMERGED = (1u << 10),
+ /** For unmerged files, checkout stage 2 from index */
+ GIT_CHECKOUT_USE_OURS = (1u << 11),
+ /** For unmerged files, checkout stage 3 from index */
+ GIT_CHECKOUT_USE_THEIRS = (1u << 12),
+
/** Treat pathspec as simple list of exact match file paths */
GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH = (1u << 13),
@@ -141,13 +148,6 @@ typedef enum {
* THE FOLLOWING OPTIONS ARE NOT YET IMPLEMENTED
*/
- /** Allow checkout to skip unmerged files (NOT IMPLEMENTED) */
- GIT_CHECKOUT_SKIP_UNMERGED = (1u << 10),
- /** For unmerged files, checkout stage 2 from index (NOT IMPLEMENTED) */
- GIT_CHECKOUT_USE_OURS = (1u << 11),
- /** For unmerged files, checkout stage 3 from index (NOT IMPLEMENTED) */
- GIT_CHECKOUT_USE_THEIRS = (1u << 12),
-
/** Recursively checkout submodules with same options (NOT IMPLEMENTED) */
GIT_CHECKOUT_UPDATE_SUBMODULES = (1u << 16),
/** Recursively checkout submodules if HEAD moved in super repo (NOT IMPLEMENTED) */
@@ -238,6 +238,9 @@ typedef struct git_checkout_opts {
git_tree *baseline; /** expected content of workdir, defaults to HEAD */
const char *target_directory; /** alternative checkout path to workdir */
+
+ const char *our_label; /** the name of the "our" side of conflicts */
+ const char *their_label; /** the name of the "their" side of conflicts */
} git_checkout_opts;
#define GIT_CHECKOUT_OPTS_VERSION 1