Skip to content

Instantly share code, notes, and snippets.

@aggarwalsushant

aggarwalsushant/.gitconfig

Created September 8, 2020 11:58
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save aggarwalsushant/e2e1aee252b298a4062230d00f56acb5 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save aggarwalsushant/e2e1aee252b298a4062230d00f56acb5 to your computer and use it in GitHub Desktop.
Download ZIP
My gitconfig
Raw
.gitconfig
# This is Git's per-user configuration file.
[user]
# Please adapt and uncomment the following lines:
name = Sushant Aggarwal
email = [email protected]
#______________________________________________________________________
# SourceTree's diff viewer
[difftool "sourcetree"]
cmd = '' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
cmd = "'' "
trustExitCode = true
#______________________________________________________________________
# Meld's settings
[difftool "meld"]
path = C:/Program Files (x86)/Meld/Meld.exe
[mergetool "meld"]
path = C:/Program Files (x86)/Meld/Meld.exe
#______________________________________________________________________
# VS 2019's default diff viewer
[difftool "vsdiffmerge"]
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer\\vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
keepBackup = false
#______________________________________________________________________
# Don't prompt to launch diff tool to view diffs.
[difftool]
prompt = false
#______________________________________________________________________
# Beyond compare's diff viewer
[difftool "bc3"]
cmd = \"C:\\Program Files\\Beyond Compare 4\\BCompare.exe\" \"$LOCAL\" \"$REMOTE\"
[mergetool "bc3"]
path = C:\\Program Files\\Beyond Compare 4\\BCompare.exe
#______________________________________________________________________
# Default diff and merge tool selection
[diff]
tool = bc3
[merge]
tool = bc3
#______________________________________________________________________
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment