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 | |
| parent | 6b30b20765e0895bae8ee957fdd08c0e2853329a (diff) | |
| download | gitea-6a6a7512c2c85f6e8ec485f8ae1ed290c6730134.tar.gz gitea-6a6a7512c2c85f6e8ec485f8ae1ed290c6730134.zip | |
notice
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | models/pull.go | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -29,7 +29,8 @@ Gogs - Go Git Service [ has been reset in **Jan 28, 2015** and will reset multiple times after. Please do **NOT** put your important data on the site. - The demo site [try.gogs.io](https://try.gogs.io) is running under `develop` branch. -- :bangbang:<span style="color: red">You **MUST** read [CONTRIBUTING.md](CONTRIBUTING.md) before you start filing an issue or making a Pull Request, and **MUST** discuss with us on [Gitter](https://gitter.im/gogits/gogs) for UI changes and feature Pull Requests, otherwise it's high possibilities that we are not going to merge it.</span>:bangbang: +- :bangbang:<span style="color: red">You **MUST** read [CONTRIBUTING.md](CONTRIBUTING.md) before you start filing an issue or making a Pull Request, and **MUST** discuss with us on [Gitter](https://gitter.im/gogits/gogs) for UI changes, otherwise it's high possibilities that we are not going to merge it.</span>:bangbang: +- Please [start discussion](http://forum.gogs.io/category/2/general-discussion) or [ask a question](http://forum.gogs.io/category/4/getting-help) on [the forum](http://forum.gogs.io/). GitHub issue tracker only keeps **bugs** and **feature requests**, all other topics will be closed without reason. - If you think there are vulnerabilities in the project, please talk privately to **u@gogs.io**. Thanks! - If you're interested in using APIs, we have experimental support with [documentation](https://github.com/gogits/go-gogs-client/wiki). - If your team/company is using Gogs and would like to put your logo on [our website](http://gogs.io), contact us by any means. 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) } |