Skip to content

Instantly share code, notes, and snippets.

@jednano
Last active July 13, 2018 23:45
Show Gist options
  • Save jednano/5376076 to your computer and use it in GitHub Desktop.
Save jednano/5376076 to your computer and use it in GitHub Desktop.
[user]
name = First Last
email = user@domain.com
[credential]
helper = wincred
[core]
editor = code --wait
excludesfile = C:/Users/jedma/.gitignore
autocrlf = false
[alias]
co = checkout
st = status
dt = difftool
mt = mergetool
[diff]
tool = tortoisediff
[difftool "tortoisediff"]
cmd = \""c:/Program Files/TortoiseGIT/bin/TortoiseGitMerge.exe"\" -mine:"$REMOTE" -base:"$LOCAL"
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
[merge]
tool = tortoisemerge
[mergetool "tortoisemerge"]
cmd = \""c:/Program Files/TortoiseGIT/bin/TortoiseGitMerge.exe"\" -base:"$BASE" -theirs:"$REMOTE" -mine:"$LOCAL" -merged:"$MERGED"
[mergetool "vscode"]
cmd = code --wait --diff $REMOTE $LOCAL | cp $LOCAL $MERGED #code --wait $MERGED
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment