diff options
| author | lhchavez <[email protected]> | 2020-02-23 15:08:45 +0000 |
|---|---|---|
| committer | lhchavez <[email protected]> | 2020-02-23 15:08:45 +0000 |
| commit | 3c88bd9f1aebc53ea9d77937829f8c155aa834c3 (patch) | |
| tree | 8556d00fb42f2fcab5ba748e49e21e1141b9d604 /checkout.go | |
| parent | c75e0221d70bc471917aa3de34ca1ead1a747987 (diff) | |
| parent | 21d618136f415486d95965e75af80c0e6688a0d5 (diff) | |
Merge remote-tracking branch 'upstream/master' into cherrypick-commit
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 |