config

; Config {{{1
[user]
    name       = Marco Hinz
    email      = mh.codebro@gmail.com
    signingKey = AC9D48E91BCF448C

[gpg]
    program = gpg2

[commit]
    ; gpgsign = true

[core]
    editor       = vim
    excludesfile = ~/.config/git/ignore
    autocrlf     = false
    filemode     = false

[init]
    templatedir = ~/.config/git/template

[fetch]
    prune = true

[push]
    default = current

[rebase]
    autosquash = true
    autostash  = true

[rerere]
    enabled = true

[diff]
    tool                = vimdiff
    algorithm           = patience
    mnemonicPrefix      = true
    compactionHeuristic = true

[difftool "accu"]
    cmd = "vim -c 'call mergeutil#accurev()' \"$BASE\" \"$REMOTE\" \"$LOCAL\" \"$MERGED\""

[merge]
    tool          = vimdiff
    conflictstyle = diff3

[mergetool "accu"]
    cmd           = "vim -c 'call mergeutil#accurev()' \"$BASE\" \"$REMOTE\" \"$LOCAL\" \"$MERGED\""
    trustExitCode = true

[pager]
    diff = diff-so-fancy | less -RFXx1,5
    log  = diff-so-fancy | less -RFXx1,5
    show = diff-so-fancy | less -RFXx1,5

[interactive]
    diffFilter = diff-so-fancy

[advice]
    statusHints = no

; Alias {{{1
[alias]
    a     = add
    b     = branch
    bi    = bisect
    bl    = blame
    c     = commit
    ca    = commit --amend
    cl    = clone
    co    = checkout
    cp    = cherry-pick
    d     = diff --color --no-ext-diff
    dc    = !git d --cached
    dcs   = !git d --cached --stat
    ds    = !git d --stat
    dw    = !git d --word-diff=color
    des   = describe --contains
    dt    = difftool
    f     = fetch
    g     = grep
    h     = help
    lfp   = !git l --first-parent
    ln    = !git l @{1}..
    lso   = ls-files --others --exclude-standard
    lsr   = ls-remote
    m     = merge
    ma    = merge --abort
    n     = name-rev --name-only
    p     = push
    pl    = pull --ff-only
    r     = reset
    ra    = rebase --abort
    rc    = rebase --continue
    re    = rebase
    rem   = remote
    ri    = rebase -i
    ru    = remote update
    rs    = rebase --skip
    s     = status -sb -uno
    sh    = show
    shs   = show --stat
    snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
    st    = stash
    stl   = stash list
    sts   = stash show -p
    t     = tag
    tr    = trail
    unmerged = branch --no-merged master
    wt    = worktree

    ours   = !git checkout --ours $@ && git add $@
    theirs = !git checkout --theirs $@ && git add $@

    rank    = shortlog -sn --no-merges
    authors = "!f() { git log --no-merges --pretty='format:%<(26)%an <%ae>' --author \"$*\" | sort | uniq; }; f"
    by      = "!f() { IFS=$'\n'; select a in `git authors \"$*\"`; do git l --no-merges --author \"${a%%  *<*}\"; break; done; }; f"

    upstream = !git for-each-ref --format='%(upstream:short)' $(git symbolic-ref -q HEAD)
    upstream-remote = !git upstream | sed -e 's/\\/.*$//g'

; Color {{{1
[color]
    branch      = auto
    diff        = auto
    interactive = auto
    status      = auto
    ui          = auto

[include]
    path = config.colors