.gitconfig

[user]
	name = Matthias DUGUE
	email = mdugue@clever-age.com
[color]
	ui = auto
[alias]
	st = status -sb
	co = checkout
	ci = commit
	oops = commit --amend -C HEAD
	unstage = reset HEAD --
	undo = reset --soft HEAD^1
	trash = reset --hard
	fp = format-patch
	lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%an %cr)%Creset' --abbrev-commit --date=relative
	standup = "!sh -c 'git log --since \"1 day ago\" --oneline --author=\"$(git config user.email)\"'"
	latest = for-each-ref --sort=-committerdate --format='%(committerdate:short) %(refname:short) [%(committername)]'
	last = log -1
	upstream = rev-parse --abbrev-ref --symbolic-full-name @{u}
[core]
	pager = cat
	editor = subl -n -w
	whitespace = -trailing-space
	excludesfile = ~/.gitignore_global
[credential]
	helper = osxkeychain
[grep]
	extendedRegexp = true
[log]
	abbrevCommit = true
[push]
	default = upstream
[rerere]
	autoupdate = true
	enabled = true
[diff]
	tool = Kaleidoscope
	mnemonicPrefix = true
	wordRegex = .
[difftool]
	prompt = false
[difftool "Kaleidoscope"]
	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool]
	prompt = false
	keepBackup = false
[merge]
	tool = Kaleidoscope
[mergetool "diffmerge"]
	cmd = diffmerge --merge\n--result=$MERGED $LOCAL $BASE $REMOTE
	trustExitCode = true
[mergetool "Kaleidoscope"]
	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
	trustExitCode = true