.gitconfig

.gitconfig

[user]
	name = wondger
	email = [email protected]
[alias]
	st = status
	co = checkout
	cob = checkout -b
	ca = commit --amend
	last = log --graph -1 HEAD
	aa = add .
	lol = log --graph --pretty=format:\"%C(yellow)%h%C(cyan)[%C(bold green)%cn%C(reset)%C(cyan)|%C(green)%ce%C(cyan)]%C(cyan)[%C(green)%ar%C(cyan)]%C(reset) %s\"
	b = branch
	bd = branch -d
	bdd = branch -D
	clr = clone --recursive
	ci = commit
	sl = stash list
	sa = stash apply
	ksdiff = difftool -t Kaleidoscope
	cp = cherry pick
	sbi = submodule init
	sbu = submodule update
	sbp = submodule foreach git pull
	sbco = submodule foreach git checkout master
[branch "master"]
	remote = origin
	merge = refs/heads/master
[core]
	editor = /usr/bin/vim
	excludesfile = /Users/o/.gitignore_global
	quotepath = false
[difftool "sourcetree"]
	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
	path = 
[mergetool "sourcetree"]
	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
	trustExitCode = true
[color]
	ui = true
[push]
	default = simple
[gui]
[i18n]
[merge]
[mergetool "p4merge"]
[difftool "Kaleidoscope"]
    cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff]
    tool = Kaleidoscope
[difftool]
    prompt = false

[mergetool "Kaleidoscope"]
    cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
    trustExitCode = true
[mergetool]
    prompt = false
[merge]
    tool = Kaleidoscope