Permalink
Switch branches/tags
Nothing to show
Find file
Fetching contributors…
Cannot retrieve contributors at this time
42 lines (41 sloc) 861 Bytes
[user]
name = PProvost
email = peter@provost.org
[color]
diff = auto
status = auto
branch = auto
[diff]
tool = p4merge
[merge]
tool = p4merge
[difftool "p4merge"]
cmd = "p4merge.exe $LOCAL $REMOTE"
[mergetool "p4merge"]
cmd = "p4merge $BASE $LOCAL $REMOTE $MERGED"
trustExitCode = true
keepBackup = false
[difftool "kdiff3"]
path = kdiff3.exe
keepBackup = false
trustExitCode = false
[mergetool "kdiff3"]
path = kdiff3.exe
keepBackup = false
trustExitCode = false
[core]
editor = gvim.exe
autocrlf = true
excludesfile = ~/.gitignore
[alias]
co = checkout
ci = commit
st = status
br = branch
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
type = cat-file -t
dump = cat-file -p
[push]
default = upstream
[credential]
helper = !'C:\\Users\\Peterpr\\AppData\\Roaming\\GitCredStore\\git-credential-winstore.exe'