Skip to content

Instantly share code, notes, and snippets.

@LeeFlannery
Last active December 12, 2015 03:29
Show Gist options
  • Save LeeFlannery/4707668 to your computer and use it in GitHub Desktop.
Save LeeFlannery/4707668 to your computer and use it in GitHub Desktop.
My .gitconfig with kdiff for difftool & gvim for editor
[gui]
fontdiff = -family Consolas -size 11 -weight normal -slant roman -underline 0 -overstrike 0
recentrepo = D:/projects/Redacted
[user]
name = Lee Flannery
email = lee.flannery@example.com
[core]
# editor = 'D:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -nosession -noPlugin #
editor = 'D:/Program Files (x86)/Vim/vim73/gvim.exe'
autocrlf = false
[diff]
tool = kdiff3
[difftool "kdiff"]
prompt = false
path = c:/Program Files (x86)/KDiff3/kdiff3.exe
trustExitCode = false
[merge]
tool = kdiff3
[mergetool "kdiff3"]
path = c:/Program Files (x86)/KDiff3/kdiff3.exe
keepBackup = false
trustExitCode = false
[alias]
unstage = reset HEAD
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
[http]
postBuffer = 52428800
[push]
default = simple
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment