Skip to content

Instantly share code, notes, and snippets.

@roh85
Last active November 29, 2017 15:50
Show Gist options
  • Save roh85/c81f57bb96e69e00d9260d656c80d9ed to your computer and use it in GitHub Desktop.
Save roh85/c81f57bb96e69e00d9260d656c80d9ed to your computer and use it in GitHub Desktop.
[push]
default = simple
[user]
name = ''
email = ''
[core]
autocrlf = true
excludesfile =
[diff]
tool = vsdiffmerge
[difftool]
prompt = false
[difftool "vsdiffmerge"]
cmd = 'C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer/vsdiffmerge.exe' $LOCAL $REMOTE Source Target //ignorespace //t
keepbackup = false
trustexistcode = true
[merge]
tool = vsdiffmerge
[mergetool]
prompt = false
keepBackup = false
keepTemporaries = false
[mergetool "vsdiffmerge"]
cmd = 'C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer/vsdiffmerge.exe' $LOCAL $REMOTE $BASE $MERGED //ignorespace //m
keepbackup = false
trustexistcode = true
[color]
ui = auto
[http]
postBuffer = 524288000
[alias]
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment