It doesn’t work by default

How to configure Visual Studio to enable git rebase

Visual Studio doesn’t support the git rebase workflow by default. I’ll show you the required settings that need to be changed.

Photo by Rubaitul Azad on Unsplash

The git rebase strategy is commonly used in larger software development projects. One main advantage to the git merge strategy is that if you work with feature branches, all commits of one feature are in line. When traversing the history you will always be in the same feature until back to the beginning. When using the git merge approach, commits of different features can be within your feature which makes it harder to debug in case of errors.

You want your history to look like this (features aren’t divided):

- feature2_commit2
- feature2_commit1
- feature1_commit4
- feature1_commit3
- feature1_commit2
- feature1_commit1

But it should not look like this (features are divided):

- feature1_commit4
- feature2_commit2
- feature1_commit3
- feature2_commit1
- feature1_commit2
- feature1_commit1

A good summary of the approaches (and the git terms in general) can be found in the following article: