diff options
| author | Thibault Meyer <0xbaadf00d@users.noreply.github.com> | 2016-11-12 12:09:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-12 12:09:25 +0100 |
| commit | 54e6ed3431c559f4534210f8e5431acff0a99735 (patch) | |
| tree | df696dd6f09e822354318b42f700ff1a7da49aeb /vendor/code.gitea.io/git/repo.go | |
| parent | b339858500d3c0faf8c37ee786c22657c60a5833 (diff) | |
| download | gitea-54e6ed3431c559f4534210f8e5431acff0a99735.tar.gz gitea-54e6ed3431c559f4534210f8e5431acff0a99735.zip | |
Upgrade vendor "git" (#161)
Diffstat (limited to 'vendor/code.gitea.io/git/repo.go')
| -rw-r--r-- | vendor/code.gitea.io/git/repo.go | 4 |
1 files changed, 4 insertions, 0 deletions
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 { |