gitconfig

[user]
	name = QueezyTheGreat
	email = queezythegreat@gmail.com
[merge]
    tool = vimdiff3
#    ff = false      # Always create a merge commit


[color]
    ui = true
    branch = auto
    diff = auto
    status = auto

[color "branch"]
    current = yellow reverse
    local = yellow
    remote = green

[color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold

[color "status"]
    header = white
    added = green bold
    changed = red bold
    untracked = white bold

[giggle]
	main-window-maximized = false
	main-window-geometry = 1477x787+240+158
	history-view-vpane-position = 443
	main-window-view = FileView
	file-view-vpane-position = 650

[log]
    decorate=short

[push]
    default = current    # push current branch to upstream matching branch

[alias]
    bmerge = merge --no-ff
    incoming = !git l ..$(git branch -vvv | grep '^*' | sed -n -r 's/^[^[]*\\[([^:]*):?.*\\].*$/\\1/p')
    outgoing = !git l   $(git branch -vvv | grep '^*' | sed -n -r 's/^[^[]*\\[([^:]*):?.*\\].*$/\\1/p')..
    l = log --graph --stat --color
    queezythegreat = !git config user.name QueezyTheGreat && git config user.email queezythegreat@gmail.com

[mergetool "vimdiff3"]
	cmd = vim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
[http]
	sslVerify = 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
[core]
	autocrlf = false
[credential]
	helper = cache
[filter "lfs"]
	required = true
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
[pull]
	rebase = false