gitconfig

[user]
	name = Patricia Garcia
	email = pat@patriciagarcia.me
[credential]
	helper = osxkeychain
[core]
	excludesfile = /Users/pat/.gitignore
        pager = "/usr/bin/less -RciqMSj5"
        editor = vim
	autocrlf = input
[merge]
        tool = vimdiff
[color]
        diff = auto
        branch = auto
        status = auto
        interactive = auto
[diff]
        renames = true
[alias]
        st = status
        d = diff
        ci = commit -v
        cia = commit -v -a
        co = checkout
        cp = cherry-pick
        l = log
        ll = log -p
        lt = log trunk..
        llt = log -p trunk..
        lm = log master..
        llm = log -p master..
        b = branch
	plog = "log --pretty=\"%Cgreen%h%Creset – %Cred%ci%Creset – %s (%Cred%an%Creset)\""
	slog = "log --pretty=\"%Cgreen%h%Creset – %Cred%ci%Creset – %s (%Cred%an%Creset)\" HEAD~15..HEAD"
        undo = reset --soft HEAD^
        f = fetch upstream
        r = rebase upstream/master
        rd = rebase upstream/develop
        pi = stash apply --index stash@{0}
	unstage = reset HEAD --
	last = log -1 HEAD
        addup = git remote add upstream
        pre = !git fetch origin && git co develop && git rebase origin/develop && git co -b
        hot = !git fetch origin && git co master && git rebase origin/master && git co -b
        prep = !git fetch origin && git rebase origin/master
        rel = !git fetch origin && git co master && git rebase origin/master && git merge
        up = push origin
        end = push :
[push]
	default = simple
[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
[filter "media"]
	required = true
	clean = git media clean %f
	smudge = git media smudge %f
[url "git://"]
	insteadOf = https://