DEV Community

Cover image for Setting Visual Studio Code as your git merge and diff tool
Leandro Cavalcante
Leandro Cavalcante

Posted on

Setting Visual Studio Code as your git merge and diff tool

#git #vscode #merge #diff

Paste the following lines in your ~/.gitconfig file:

# This is Git's per-user configuration file.
[core]
    editor = code --wait
[diff]
    tool = default-difftool
[difftool "default-difftool"]
    cmd = code --wait --diff $LOCAL $REMOTE
[merge]
    tool = default-mergetool
[mergetool "default-mergetool"]
    cmd = code --wait $MERGED
Enter fullscreen mode Exit fullscreen mode

Done! Next time you do a git commit or whatever operation that needs a text editor, Visual Studio Code will be opened as your default editor.

Top comments (0)

Read next

tylerlwsmith profile image

Change Fugitive's number of Git context lines in Neovim

Tyler Smith -

sarvar_04 profile image

🚀"Streamlining Infrastructure Deployment: 💻 Seamless CloudFormation Stack Deployment with Git Sync🔄"

Sarvar Nadaf -

arjuncodess profile image

Your Git Commit Messages Suck! Here's What To Fix 🛠

Arjun Vijay Prakash -

helplanes profile image

Google's Project IDX, the Future of Web Development (VSCode Killer)?

Krish Bhagwat -