diff options
| author | Unknwon <u@gogs.io> | 2015-11-20 11:37:17 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-11-20 11:37:17 -0500 |
| commit | 6a6a7512c2c85f6e8ec485f8ae1ed290c6730134 (patch) | |
| tree | f00293d163fe105e0f1f82ee38cfb065aa2660fd /models | |
| parent | 6b30b20765e0895bae8ee957fdd08c0e2853329a (diff) | |
| download | gitea-6a6a7512c2c85f6e8ec485f8ae1ed290c6730134.tar.gz gitea-6a6a7512c2c85f6e8ec485f8ae1ed290c6730134.zip | |
notice
Diffstat (limited to 'models')
| -rw-r--r-- | models/pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/models/pull.go b/models/pull.go index f5f3630277..dfd80635e4 100644 --- a/models/pull.go +++ b/models/pull.go @@ -193,7 +193,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error } if _, stderr, err = process.ExecDir(-1, tmpBasePath, - fmt.Sprintf("PullRequest.Merge (git merge --no-commit): %s", tmpBasePath), + fmt.Sprintf("PullRequest.Merge (git merge --no-ff --no-commit): %s", tmpBasePath), "git", "merge", "--no-ff", "--no-commit", "head_repo/"+pr.HeadBranch); err != nil { return fmt.Errorf("git merge --no-ff --no-commit [%s]: %v - %s", tmpBasePath, err, stderr) } |