gitconfig

[user]
    name = Thomas Krille
[include]
    path = .gitconfig.d/userdetails
[alias]
    rb = rebase
    fa = fetch --all
    fu = fetch upstream
    fo = fetch origin
    st = status -s -b
    ci = commit
    br = branch
    co = checkout
    fcum = "!git fetch upstream; git checkout -B master upstream/master"
    fcom = "!git fetch origin; git checkout -B master origin/master"
    s = stash
    sp = stash pop
    df = diff
    dc = diff --cached
    lg = log -p
    cp = cherry-pick
    who = shortlog -s --
    alias = "!sh -c '[ $# = 2 ] && git config --global alias.\"$1\" \"$2\" && exit 0 || echo \"usage: git alias <new alias> <original command>\" >&2 && exit 1' -"
    aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'
    loggraph = log --graph --decorate --pretty=oneline --abbrev-commit
    ls = log --decorate --pretty=oneline --abbrev-commit -20 --no-merges
    lsm = log --decorate --pretty=oneline --abbrev-commit -20
    lsa = log --decorate --pretty=oneline --abbrev-commit
    prune-all = !git remote | xargs git remote prune
    uncommit = reset HEAD^
    cane  = commit --all --amend --no-edit
    yolo  = "!git cane && git push --force"
    rau = remote add upstream
    merge-mr = !sh -c 'git fcum && git checkout -B merge-request-$1 && git fetch upstream merge-requests/$1/head && git merge --no-edit --no-ff FETCH_HEAD' --
[diff]
    compactionHeuristic = true
[diff "blackbox"]
    textconv = gpg2 --use-agent -q --batch --decrypt
[core]
    whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
    excludesfile = ~/.gitexcludes
    pager = less -F -X
[pager]
    log = diff-so-fancy | less -F -X
    show = diff-so-fancy | less -F -X
    diff = diff-so-fancy | less -F -X
[branch]
    autosetuprebase = always
[push]
    default = current
[merge]
    tool = meld
[rebase]
	autosquash = true
[filter "lfs"]
	clean = git-lfs clean %f
	smudge = git-lfs smudge %f
	required = true