Skip to content

Instantly share code, notes, and snippets.

@markcam1
Created December 13, 2018 05:56
Show Gist options
  • Save markcam1/aa73bb2635ee0bb197f5637757a5cad6 to your computer and use it in GitHub Desktop.
Save markcam1/aa73bb2635ee0bb197f5637757a5cad6 to your computer and use it in GitHub Desktop.
git config
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[user]
name = markcam1
email = 32405690+markcam1@users.noreply.github.com
[push]
default = upstream
[merge]
conflictstyle = diff3
[alias]
co = checkout
[core]
autocrlf = input
safecrlf = false
[merge]
tool = kdiff3
[mergetool "kdiff3"]
path = C:/Program Files/KDiff3/kdiff3.exe
trustExitCode = false
[diff]
guitool = kdiff3
[difftool "kdiff3"]
path = C:/Program Files/KDiff3/kdiff3.exe
trustExitCode = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment