Permalink
Switch branches/tags
Nothing to show
Find file
Fetching contributors…
Cannot retrieve contributors at this time
49 lines (46 sloc) 1 KB
[user]
name = Gavin Montague
email = gavin.montague@itison.com
[alias]
co = checkout
s = status
c = commit
unstage = reset HEAD --
last = log -1 HEAD
tree = log --graph --decorate --pretty=oneline --abbrev-commit
[color]
diff = auto
status = auto
branch = auto
[core]
excludesfile = ~/.git/ignore_global
editor = vim
[apply]
whitespace = nowarn
[mergetool]
keepBackup = true
[push]
default = simple
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff]
tool = Kaleidoscope
[difftool]
prompt = false
[diff "nodiff"]
command = /usr/bin/true
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool]
prompt = false
[merge]
tool = Kaleidoscope
[init]
templatedir = ~/.git/template
[commit]
template = ~/.git/message
[filter "lfs"]
required = true
clean = git-lfs clean %f
smudge = git-lfs smudge %f