From 6a6a7512c2c85f6e8ec485f8ae1ed290c6730134 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Fri, 20 Nov 2015 11:37:17 -0500 Subject: notice --- models/pull.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'models') diff --git a/models/pull.go b/models/pull.go index f5f36302..dfd80635 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) } -- cgit v1.2.3