.gitconfig

[user]
	email = mchugh.r@gmail.com
	name = Ronan McHugh
[core]
	editor = vim
	pager = diff-so-fancy | less --tabs=1,5 -R
	excludesfile = /Users/romchugh/.gitignore
[push]
	default = simple
[color]
	ui = true
[alias]
	co = checkout
	s = status
	ci = commit
	wc = whatchanged
	unstage = reset HEAD --
	lol = log --graph --decorate --pretty=oneline --abbrev-commit
    sshow = "!f() { git stash show stash^{/$*} -p; }; f"
    sapply = "!f() { git stash apply stash^{/$*}; }; f"
	st = status -sb
	dc = diff --cached
    slog = log --pretty=oneline --abbrev-commit -10
    logme = log --author=Ronan
    branch-name = rev-parse --abbrev-ref HEAD
    zpush = !git push -u origin `git branch-name`:romchugh-`git branch-name`
    fpush = push -f
    pushf = push -f
    amd = ci --amend -C @
    cim = ci -m
    cob = co -b
    tmp = ci -m tmp
    addu = add -u
[merge]
	tool = meld
[mergetool]
    prompt = false
	keepBackup = false
[mergetool "meld"]
    trustExitCode = true
    cmd = open -W -a Meld --args --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output=\"$MERGED\"
[color "diff-highlight"]
	oldNormal = red bold
	oldHighlight = red bold 52
	newNormal = green bold
	newHighlight = green bold 22