diff options
| author | Vicent Marti <tanoku@gmail.com> | 2013-06-25 00:25:35 +0200 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2013-06-25 00:25:35 +0200 |
| commit | 29d7242b1dcd1f09a63417abd648a6217b85d301 (patch) | |
| tree | dedc3bc07a500770382ca4c517e4bb015e506c4b /include/git2/checkout.h | |
| parent | a50086d174658914d4d6462afbc83b02825b1f5b (diff) | |
| parent | eddc1f1ed78898a4ca41480045b1d0d5b075e773 (diff) | |
| download | libgit2-29d7242b1dcd1f09a63417abd648a6217b85d301.tar.gz | |
Merge branch 'development'
Diffstat (limited to 'include/git2/checkout.h')
| -rw-r--r-- | include/git2/checkout.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/git2/checkout.h b/include/git2/checkout.h index d3e971b43..a086408c7 100644 --- a/include/git2/checkout.h +++ b/include/git2/checkout.h @@ -134,6 +134,9 @@ typedef enum { /** Treat pathspec as simple list of exact match file paths */ GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH = (1u << 13), + /** Ignore directories in use, they will be left empty */ + GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES = (1u << 18), + /** * THE FOLLOWING OPTIONS ARE NOT YET IMPLEMENTED */ @@ -180,6 +183,8 @@ typedef enum { GIT_CHECKOUT_NOTIFY_UPDATED = (1u << 2), GIT_CHECKOUT_NOTIFY_UNTRACKED = (1u << 3), GIT_CHECKOUT_NOTIFY_IGNORED = (1u << 4), + + GIT_CHECKOUT_NOTIFY_ALL = 0x0FFFFu } git_checkout_notify_t; /** Checkout notification callback function */ @@ -231,6 +236,8 @@ typedef struct git_checkout_opts { git_strarray paths; git_tree *baseline; /** expected content of workdir, defaults to HEAD */ + + const char *target_directory; /** alternative checkout path to workdir */ } git_checkout_opts; #define GIT_CHECKOUT_OPTS_VERSION 1 |