-
-
Notifications
You must be signed in to change notification settings - Fork 5.3k
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
Labels
type/feature
Completely new functionality. Can only be merged if feature freeze is not active.
Milestone
Comments
1 task
lafriks
pushed a commit
that referenced
this issue
Dec 27, 2018
Signed-off-by: Julian Tölle <[email protected]>
This is included in 1.7 release. So can get closed. |
7 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
type/feature
Completely new functionality. Can only be merged if feature freeze is not active.
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.
The text was updated successfully, but these errors were encountered: