VS Code configuring Git Sync

Question

I am using Code to work on some files in a git repository, when i make some changes on a branch and one of my colleagues makes a change in the same branch (conflicts not important) and run the git/sync command it git pull --merge and I'd like to configure it to make something git pull --rebase

Can this be configured?

Benjamin Pasero · Accepted Answer · 2015-08-28 05:39:24Z

6

This can be configured via git config. There is no separate option in VS Code:

git config pull.rebase true

answered Aug 28, 2015 at 5:39

Benjamin Pasero

127k15 gold badges82 silver badges56 bronze badges

Sign up to request clarification or add additional context in comments.

Comments

gianlucaparadise · Accepted Answer · 2018-11-07 09:18:08Z

4

You can now Sync+Rebase since September2018 release https://code.visualstudio.com/updates/v1_28#_always-rebase-when-running-sync

The git.rebaseWhenSync setting will let you configure the Sync command to always use rebase instead of merge when running

answered Nov 7, 2018 at 9:18

gianlucaparadise

1,77322 silver badges34 bronze badges

Collectives™ on Stack Overflow

VS Code configuring Git Sync

2 Answers 2

Comments

Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

2 Answers 2

Comments

Comments

Your Answer

Sign up or log in

Post as a guest

Related