From f1e58e0d30095cf768ff04d379b5e4145a874be8 Mon Sep 17 00:00:00 2001
From: Máximo Cuadros <mcuadros@gmail.com>
Date: Fri, 1 Sep 2017 17:26:52 +0200
Subject: Worktree.Reset ignore untracked files on Merge mode

---
 repository.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'repository.go')

diff --git a/repository.go b/repository.go
index 932b8d4..fbc7871 100644
--- a/repository.go
+++ b/repository.go
@@ -456,7 +456,10 @@ func (r *Repository) clone(ctx context.Context, o *CloneOptions) error {
 			return err
 		}
 
-		if err := w.Reset(&ResetOptions{Commit: head.Hash()}); err != nil {
+		if err := w.Reset(&ResetOptions{
+			Mode:   MergeReset,
+			Commit: head.Hash(),
+		}); err != nil {
 			return err
 		}
 
-- 
cgit