Rebase & Merge is confusing and useless

[Hedede]

Select Topic Area

Product Feedback

Body

There are a few issues with the "Rebase and merge" function.

First, it still does a rebase even if the branch is already rebased. This is not how git rebase works by default. If you try to rebase a branch that is already rebased it won't do anything and you'll get a message Current branch [NAME] is up to date.

• This behavior breaks my workflow where I always do git merge --ff-only.
• This makes it annoying to continue working on the local branch since I have to do a git fetch && git rebase origin/master instead of just doing git checkout -b new-branch and continuing working on it. And this is even worse when you have multiple people working on a branch.

Second, the "Rebase and merge" is ambiguous. We've already established that the "rebase" doesn't work the way one would expect from git rebase. The "merge" part can also work in several different ways. It can work like git merge --ff-only, or it can work like git merge --no-ff, creating a merge commit.

So, this "rebase and merge" function doesn't fit any useful workflow. It doesn't fit "rebase and fast-forward" nor does it fit actual "rebase and merge (--no-ff)"