gitconfig

[color]
    ui = true
[user]
	name = Marcel Beumer
	email = marcel@marcelbeumer.com
[alias]
   #
[http]
#   proxy = http://tst-proxy:8888
[credential]
    helper = osxkeychain
; [pull]
;     # always add --rebase flag when pulling to avoid useless merges
;     rebase = true
[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]
	excludesfile = /Users/marcel/.gitignore_global
[grep]
	extendRegexp = true
	lineNumber = true
[alias]
	ack = grep --break --heading --line-number
    st = status
    l = pull
    lr = pull --rebase
    f = fetch
    up = fetch && git rebase
    un = reset HEAD --
    p = push
    c = commit -v
    ca = commit -v -a
    co = checkout
    cm = checkout master
    b = branch
    ba = branch -a
    cp = cherry-pick
    lg = log --stat --max-count=5
    lgg = log --graph --max-count=5
    lp = log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr by %an)%Creset' --abbrev-commit --date=relative
    ss = status -s
    a = add
    ar = !git add . && git ls-files --deleted | xargs git rm
    m = merge
    rh = reset HEAD
    rhh = reset HEAD --hard
    pick = cherry-pick