DEV Community

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

Posted on

1

Setting Visual Studio Code as your git merge and diff tool

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)

AWS Security LIVE!

Tune in for AWS Security LIVE!

Join AWS Security LIVE! for expert insights and actionable tips to protect your organization and keep security teams prepared.

Learn More

👋 Kindness is contagious

Explore a sea of insights with this enlightening post, highly esteemed within the nurturing DEV Community. Coders of all stripes are invited to participate and contribute to our shared knowledge.

Expressing gratitude with a simple "thank you" can make a big impact. Leave your thanks in the comments!

On DEV, exchanging ideas smooths our way and strengthens our community bonds. Found this useful? A quick note of thanks to the author can mean a lot.

Okay