Skip to content

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

Closed
@InExtremaRes

Description

@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.

Activity

added
type/featureCompletely new functionality. Can only be merged if feature freeze is not active.
backport/doneAll backports for this PR have been created
and removed
backport/doneAll backports for this PR have been created
on Apr 27, 2018
added this to the 1.6.0 milestone on May 30, 2018
modified the milestones: 1.6.0, 1.7.0 on Aug 29, 2018
modified the milestones: 1.7.0, 1.8.0 on Dec 19, 2018
davidak

davidak commented on Jan 26, 2019

@davidak

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

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

modified the milestones: 1.8.0, 1.7.0 on Jan 27, 2019
locked and limited conversation to collaborators on Nov 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    type/featureCompletely new functionality. Can only be merged if feature freeze is not active.

    Type

    No type

    Projects

    No projects

    Relationships

    None yet

      Development

      No branches or pull requests

        Participants

        @lunny@davidak@techknowlogick@lafriks@InExtremaRes

        Issue actions

          Add "Rebase AND merge commit" (--no-ff) to Pull Request · Issue #3844 · go-gitea/gitea