Skip to content
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.

Sign up for GitHub

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

Jump to bottom

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

Closed
InExtremaRes opened this issue Apr 23, 2018 · 1 comment
Closed

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

InExtremaRes opened this issue Apr 23, 2018 · 1 comment
Labels
type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Milestone
1.7.0

Comments

@InExtremaRes
Copy link

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.
@lafriks lafriks added type/feature Completely new functionality. Can only be merged if feature freeze is not active. backport/done All backports for this PR have been created and removed backport/done All backports for this PR have been created labels Apr 27, 2018
@apricote apricote mentioned this issue May 26, 2018
Merged
1 task
@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 pushed a commit that referenced this issue Dec 27, 2018
@apricote @lafriks
Add rebase with merge commit merge style (#3844) (#4052)
4a685f8 
Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>
@davidak
Copy link

davidak commented Jan 26, 2019

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

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

@davidak davidak mentioned this issue Jan 26, 2019
Closed
7 tasks
@lafriks lafriks modified the milestones: 1.8.0, 1.7.0 Jan 27, 2019
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Projects
None yet
Milestone
1.7.0
Development

No branches or pull requests
5 participants
@lunny @davidak @techknowlogick @lafriks @InExtremaRes