diff options
| author | lhchavez <[email protected]> | 2019-01-08 02:01:44 +0000 |
|---|---|---|
| committer | lhchavez <[email protected]> | 2019-01-08 02:01:44 +0000 |
| commit | b609c04b681655f474b13798f6c74658295fa3a4 (patch) | |
| tree | 5373c4bc84d15ea28226103c11fd293dcdec7396 /checkout.go | |
| parent | d7fd15b1e0fda55c7237609bbdc8caddff49d032 (diff) | |
| parent | 2609f4c6f25a7da56e2e4960c250ea3dfb53e82b (diff) | |
Merge remote-tracking branch 'upstream/master' into mempack
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 |