To do this in one step you can paste the following snippet in your git config file.

You can change the git config to use Visual Studio Code instead of a terminal text editor. $ git config -global 'code -wait $MERGED'Ĭmd = code - wait - diff $LOCAL $REMOTE You will have to run the following two commands. The same goes for setting the git difftool. $ git config -global 'code -wait $MERGED' First you have to define a new merge tool and secondly you need to set it as the default merge tool. Ofcourse you can use Visual Studio Code for this too. Set Visual Studio code as git mergetoolīesides an editor you can set a merge tool. īy passing the -wait to the code command you tell Visual Studio Code to wait for you to close the file before returning to the terminal.

This adds the following configuration to your global git config. $ git config -global core.editor 'code -wait' To set Visual Studio Code as default editor you have to run the following command.

To do this make sure you're in the git repository and lose the -global option. You can change the configuration on a repository level too. In this case you can set Visual Studio Code as the default editor for git.ĭuring this example we will change the global git configuration. But if you're the integrated terminal in Visual Studio Code it might feel a bit awkward.

Once you use git over the command-line you'll find yourself sometimes using a terminal text editor. But for other functions of Git the command-line seems more efficient. Most of the time the Git integration of Visual Studio Code will do fine.

Git in visual studio code