Add "Rebase AND merge commit" (--no-ff) to Pull Request

[InExtremaRes]

Since #3188 Gitea has possibility of "Rebase and merge" who is great, but if you are looking for a workflow similar to git-flow then sometimes you need to rebase a branch and then merge it with a commit merge using git merge --no-ff. This keeps history almost linear while keeping track of the commits of a particular PR.

So, is there any chance to implement a sort of "Rebase and merge commit" that merge with --no-ff option after a successful rebase?

Of course this can be done manually, but it would be nice to make that on PR itself.

[davidak]

This is included in 1.7 release. So can get closed.

https://blog.gitea.io/2019/01/gitea-1.7.0-is-released/