Search code examples
gitvisual-studiovisual-studio-2019defaultgit-pull

How to discover the current default behavior for git pull?

I've started receiving this warning at VS Code startup:

enter image description here

So I downloaded Git for Windows v2.27.0. Upon running the installer, I encountered this prompt:

enter image description here

I'd like to choose the same default behavior that Visual Studio did when it first installed Git for me, so as to keep everything working smoothly. I'm enough of a novice at Git that I wouldn't want things to go awry.

I haven't proceeded yet; I don't want to risk mucking it up.

This Q&A discusses the concept but doesn't quite get there on finding out what the default is. The official documentation comes up short here as well.

Is there a way to determine the current default?

If there isn't, is it possible to change the default after the fact, in case I choose the wrong option?

Solution

  • [edit] I just re-ran the installer on Windows :

    If you have an existing .gitconfig, the installer checks it ; keeping the selected option is preserving your existing config.

    Look at your two config variables pull.rebase and pull.ff

    From a terminal :

    git config --global pull.rebase
git config --global pull.ff

    or open the .gitconfig file in your home directory

    • if pull.rebase is set to 'true' : that's the second option
    • if pull.ff is set to 'only' : that's the third option
    • else : that's the first option