diff options
| author | lhchavez <[email protected]> | 2020-02-23 13:53:17 +0000 |
|---|---|---|
| committer | lhchavez <[email protected]> | 2020-02-23 13:53:17 +0000 |
| commit | c20008416a64e2ae884a14332b258160a261a5df (patch) | |
| tree | 58ae95d9f007937876eed1aac89b0518a034e442 /checkout.go | |
| parent | 79fe156d307a9c7b294aa92c741dc0c2759a1894 (diff) | |
| parent | 4bca045e5aa98b0b791fb467705de0692fe3514f (diff) | |
Merge remote-tracking branch 'upstream/master' into git_index_add_frombuffer
Diffstat (limited to 'checkout.go')
| -rw-r--r-- | checkout.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/checkout.go b/checkout.go index db3118f..2b12058 100644 --- a/checkout.go +++ b/checkout.go @@ -35,7 +35,7 @@ const ( CheckoutDontUpdateIndex CheckoutStrategy = C.GIT_CHECKOUT_DONT_UPDATE_INDEX // Normally checkout updates index entries as it goes; this stops that CheckoutNoRefresh CheckoutStrategy = C.GIT_CHECKOUT_NO_REFRESH // Don't refresh index/config/etc before doing checkout CheckoutSkipUnmerged CheckoutStrategy = C.GIT_CHECKOUT_SKIP_UNMERGED // Allow checkout to skip unmerged files - CheckoutUserOurs CheckoutStrategy = C.GIT_CHECKOUT_USE_OURS // For unmerged files, checkout stage 2 from index + CheckoutUseOurs CheckoutStrategy = C.GIT_CHECKOUT_USE_OURS // For unmerged files, checkout stage 2 from index CheckoutUseTheirs CheckoutStrategy = C.GIT_CHECKOUT_USE_THEIRS // For unmerged files, checkout stage 3 from index CheckoutDisablePathspecMatch CheckoutStrategy = C.GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH // Treat pathspec as simple list of exact match file paths CheckoutSkipLockedDirectories CheckoutStrategy = C.GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES // Ignore directories in use, they will be left empty |