Git rebase in Visual Studio Code

Question

Here is my situation: I have a production branch, a dev branch and branches for features. While I was working on a feature I has to do a hotfix on the dev branch. Now I to rebase the feature branch I am currently working on to avoid future merging conflicts. When I used to use IDEs from JetBrain I would do a git rebase and it would do the trick. The only command I found in VSCode is Git: Sync(rebase) but this does not do anything and does not rebase. All I get is this message:

This action will push and pull commit to and from 'origin/Current_feature'

Anyone have experience with this?

Answer 1

I don't think Visual Studio Code has Git rebase functionality built-in. If you want to do your rebasing in Visual Studio Code instead with the git command-line tool or with a Git GUI, you can install the GitLens extension for VS Code.

GitLens’s README indicates that GitLens supports rebasing. It says that when viewing branches, the context menu for each branch includes these commands:

• Rebase (Interactive) Branch (via Terminal)
• Rebase (Interactive) Branch to Remote (via Terminal)

And when viewing the commits in one branch, the context menu for each commit includes this command:

• Rebase to Commit (via Terminal) (when available)

Answer 2

I just tried, it works!!

PS: I try to find the approach to setting the default "Sync" action with --rebase paramter. I find the PR of Added config option to sync+Rebase from statusbar, but it haven't landed.

Finally find the solution, git config --global pull.rebase true and it works!!

Answer 3

You could run the command directly from your terminal with: git rebase branch or git rebase -i branch

You will have to configure your gitconfig to use vscode for the interactive rebase.

Something like:

[core]
  editor = code --wait

Or by setting your envar to GIT_EDITOR=code\ --wait

As soon as you want to do something a bit out of the ordinary, using the command line yield better results.

Answer 4

Looks like this VS Code PR introduced a new git.rebaseWhenSync option: https://github.com/microsoft/vscode/pull/52527

I tested it and it looks like it works as expected.