From 54e6ed3431c559f4534210f8e5431acff0a99735 Mon Sep 17 00:00:00 2001
From: Thibault Meyer <0xbaadf00d@users.noreply.github.com>
Date: Sat, 12 Nov 2016 12:09:25 +0100
Subject: Upgrade vendor "git" (#161)

---
 vendor/code.gitea.io/git/repo.go | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'vendor/code.gitea.io/git/repo.go')

diff --git a/vendor/code.gitea.io/git/repo.go b/vendor/code.gitea.io/git/repo.go
index bfc2cbe7c8..3d6c138c79 100644
--- a/vendor/code.gitea.io/git/repo.go
+++ b/vendor/code.gitea.io/git/repo.go
@@ -121,6 +121,7 @@ func Clone(from, to string, opts CloneRepoOptions) (err error) {
 type PullRemoteOptions struct {
 	Timeout time.Duration
 	All     bool
+	Rebase  bool
 	Remote  string
 	Branch  string
 }
@@ -128,6 +129,9 @@ type PullRemoteOptions struct {
 // Pull pulls changes from remotes.
 func Pull(repoPath string, opts PullRemoteOptions) error {
 	cmd := NewCommand("pull")
+	if opts.Rebase {
+		cmd.AddArguments("--rebase")
+	}
 	if opts.All {
 		cmd.AddArguments("--all")
 	} else {
-- 
cgit v1.2.3