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

abidemi profile image

Creating an Instance on AWS using Ubuntu - AWS Tutorial

Akinsooto Abidemi -

wisdomehirim06 profile image

How Breaking a Git Branch Became My Biggest Lesson in Teamwork

Wisdom Ehirim -

farhatsharifh profile image

From Changes to Safe Keeping: Git Stash

Farhat Sharif -

rodrigo_luglio_f63c6051de profile image

🎨 VSCode Theme Generator: Create stunning themes using sacred geometry patterns

Rodrigo Luglio -