Skip to content

Instantly share code, notes, and snippets.

@pyratin
Last active April 3, 2025 04:09
Show Gist options
  • Save pyratin/97244b682d5b063df758f60b64bb26b9 to your computer and use it in GitHub Desktop.
Save pyratin/97244b682d5b063df758f60b64bb26b9 to your computer and use it in GitHub Desktop.
.gitconfig
[user]
name = shivapand
email = [email protected]
[core]
editor = nvim
[difftool]
prompt = true
[diff]
tool = nvimdiff
[difftool "nvimdiff"]
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
[init]
defaultBranch = main
[merge]
tool = nvimdiff
conflictstyle = diff3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment