diff options
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 { |