Skip to content

Instantly share code, notes, and snippets.

@Htbaa

Htbaa/.gitconfig

Created April 27, 2011 10:31
Show Gist options
  • Save Htbaa/944033 to your computer and use it in GitHub Desktop.
Save Htbaa/944033 to your computer and use it in GitHub Desktop.
Download ZIP
.gitconfig
Raw
.gitconfig
[mergetool "kdiff3"]
path = C:/Program Files (x86)/KDiff3/KDiff3.exe
[merge]
tool = kdiff3
[core]
autocrlf = true
# safecrlf = true
trustctime = false
editor = vi
[diff]
tool = kdiff3
[difftool "kdiff3"]
path = c:/Program Files (x86)/KDiff3/kdiff3.exe
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment