From d1e34a7675bf8bb95f3c40c27d446adc5862eb62 Mon Sep 17 00:00:00 2001 From: Linuxer Wang Date: Fri, 3 May 2019 09:46:54 -0700 Subject: Keep local changes when checkout branch in worktree. Signed-off-by: Linuxer Wang --- worktree.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'worktree.go') 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 { -- cgit