Permalink
Find file
Fetching contributors…
Cannot retrieve contributors at this time
40 lines (39 sloc) 941 Bytes
[use]
[user]
name = atwam
email = damien@atwam.com
[github]
user = atwam
token = ! echo ~/.githubtoken 2> /dev/null
[giggle]
main-window-maximized = true
main-window-geometry = 469x281+8+97
history-view-vpane-position = 317
main-window-view = HistoryView
file-view-vpane-position = 316
[color]
diff = auto
status = auto
branch = auto
ui = true
[core]
autocrlf = input
excludesfile = ~/.gitignore
[apply]
whitespace = nowarn
[format]
pretty = %C(yellow)%h%Creset %s %C(red)(%cr)%Creset
[push]
default = tracking
[alias]
lgb = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset%n' --abbrev-commit --date=relative --branches
[filter "lfs"]
smudge = git-lfs smudge %f
required = true
clean = git-lfs clean %f
[merge]
tool = diffconflicts
[mergetool "diffconflicts"]
cmd = diffconflicts vim $BASE $LOCAL $REMOTE $MERGED
trustExitCode = true
keepBackup = false