diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2019-05-16 09:21:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-16 09:21:15 +0200 |
| commit | 7bdcd80a8c4ff0dab240d603258ba60b28102683 (patch) | |
| tree | 53bfb94ef1a2ed250b9edc60f803d6066314e29a /worktree.go | |
| parent | 24de5efe77a202ddba83abb4d14095474dcdf1f6 (diff) | |
| parent | d1e34a7675bf8bb95f3c40c27d446adc5862eb62 (diff) | |
| download | go-git-7bdcd80a8c4ff0dab240d603258ba60b28102683.tar.gz | |
Merge pull request #1145 from linuxerwang/master
Worktree: keep local changes when checkout branch
Diffstat (limited to 'worktree.go')
| -rw-r--r-- | worktree.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/worktree.go b/worktree.go index dae40a3..1b10449 100644 --- a/worktree.go +++ b/worktree.go @@ -160,6 +160,8 @@ func (w *Worktree) Checkout(opts *CheckoutOptions) error { ro := &ResetOptions{Commit: c, Mode: MergeReset} if opts.Force { ro.Mode = HardReset + } else if opts.Keep { + ro.Mode = SoftReset } if !opts.Hash.IsZero() && !opts.Create { |