Skip to content

Instantly share code, notes, and snippets.

@johnnyasantoss

johnnyasantoss/.gitconfig

Last active April 11, 2024 12:54
Show Gist options
  • Star 13 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save johnnyasantoss/f0a99283a6ef428365e0cd5eab7ae99d to your computer and use it in GitHub Desktop.
Save johnnyasantoss/f0a99283a6ef428365e0cd5eab7ae99d to your computer and use it in GitHub Desktop.
Download ZIP
JetBrains Rider as Default Merge and Diff tool
Raw
.gitconfig
# Diff with JetBrains Rider
[diff]
tool = rider
[difftool]
prompt = false
[difftool "rider"]
cmd = D:\\\\Program\\ Files\\\\Jetbrains\\\\apps\\\\Rider\\\\ch-0\\\\181.4379.788\\\\bin\\\\rider64.exe diff "$LOCAL" "$REMOTE"
# Merge with JetBrains Rider
[merge]
tool = rider
[mergetool]
prompt = false
[mergetool "rider"]
cmd = D:\\\\Program\\ Files\\\\Jetbrains\\\\apps\\\\Rider\\\\ch-0\\\\181.4379.788\\\\bin\\\\rider64.exe merge $LOCAL $REMOTE $BASE $MERGED
trustExitCode = true
@kirano99
Copy link

Thanks for this! Super helpful! 👍

@adiletelf
Copy link

Amazing!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment