New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
InExtremaRes opened this Issue Apr 23, 2018 · 0 comments

Comments

4 participants
@InExtremaRes
Copy link

InExtremaRes commented Apr 23, 2018

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.

apricote added a commit to apricote/gitea that referenced this issue May 26, 2018

add rebase with merge commit merge style (go-gitea#3844)
Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>

@lunny lunny added this to the 1.6.0 milestone May 30, 2018

@techknowlogick techknowlogick modified the milestones: 1.6.0, 1.7.0 Aug 29, 2018

@techknowlogick techknowlogick modified the milestones: 1.7.0, 1.8.0 Dec 19, 2018

lafriks added a commit that referenced this issue Dec 27, 2018

Add rebase with merge commit merge style (#3844) (#4052)
Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment