diff options
| author | Carlos MartÃn Nieto <[email protected]> | 2018-12-17 10:52:34 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-12-17 10:52:34 +0000 |
| commit | 8b368063e958f421ca973b49fb71a092b696cf92 (patch) | |
| tree | 1664b98891ab468421c829dd08f483c36e1dabd2 | |
| parent | eec1547c20617534ad9e825673bf78e355dda7d9 (diff) | |
| parent | a2ac1b9ed115b7576b59a3f54abe3a93ce24d44e (diff) | |
Merge pull request #468 from wmedlar/patch-1
Fix typo in constant name
| -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 |