gitconfig

[user]
    name = Julie Engel
    email = jue@metanet.ch
[credential]
    helper = osxkeychain
[core]
    editor = vim
    excludesfile = /Users/julieengel/.gitignore_global
    quotepath = false
    autocrlf = input
[status]
	submoduleSummary = true
[push]
    default = simple
[http]
    postBuffer = 524288000
[merge]
	tool = difffork
[mergetool]
    prompt = false
[mergetool "difffork"]
    trustExitCode = true
    cmd = `/usr/local/bin/difffork $LOCAL $REMOTE $BASE $MERGED`
[diff]
	submodule = log
    tool = difffork
    compactionHeuristic = true
	algorithm = histogram
[difftool]
    prompt = false
[difftool "difffork"]
    trustExitCode = true
    cmd = `/usr/local/bin/difffork $LOCAL $REMOTE`
[pager]
    diff = diff-so-fancy | less --tabs=4 -R
    show = diff-so-fancy | less --tabs=4 -R
[color]
    ui = auto
    diff = auto
[color "diff"]
    meta = yellow bold
    commit = green bold
    frag = magenta bold
    old = red
    new = green
    whitespace = red reverse
[color "diff-highlight"]
    oldNormal = red
    oldHighlight = red 52
    newNormal = green
    newHighlight = green 22
[commit]
    template = /Users/julieengel/.stCommitMsg
[alias]
    # [all branches] simple commit overview: lists short sha's and branch names (no files/changes)
    ll = log --decorate --oneline --abbrev-commit --all
    # [all branches] show recent activity on all branches: short sha, branch, author, commit msg, relative time (no files/changes)
    ls = log --pretty=format:'%C(yellow)%h%Cred%d%Creset - %C(cyan)%an %Creset: %s %Cgreen(%cr)' --all
    # [current branch] show commits and affected files/changes on current branches
    changelog = log --stat --pretty=format:'%C(yellow)%h%Creset%C(blue)%d%Creset %C(yellow bold)%ar%Creset %C(red bold)%an%Creset %C(white bold)%s%Creset' --abbrev-commit --date=relative
    # [current branch] `git changelog` for the last 7 days
    recent = log --stat --since='7 Day Ago' --pretty=format:'%C(yellow)%h%Creset%C(blue)%d%Creset %C(yellow bold)%ar%Creset %C(red bold)%an%Creset %C(white bold)%s%Creset' --abbrev-commit --date=relative
    # [current branch] show commits on current branch from within last 24h
    today = log --stat --since='1 Day Ago' --graph --pretty=oneline --abbrev-commit --date=relative
    # show branch dependencies graphically
    lgraph = log --graph --pretty=format:'%C(yellow)%h%Creset%C(blue)%d%Creset %C(white bold)%s%Creset %C(white dim)(by %an %ar)%Creset' --all
    #lbranch = log --graph --simplify-by-decoration --pretty=format:'%d' --all
    # better mnemonics
    unstage = reset HEAD
    info = show
    st = status -sb