gitconfig

~/.gitconfig

[merge]
    tool = vimdiff
    conflictsytle = diff3

[mergetool]
    prompt = false

insteadOf-urls work like shortcuts, e.g. git clone aur:spotify is equivalent to git clone https://aur.archlinux.org/spotify.

[url "https://aur.archlinux.org/"]
    insteadOf = "aur:"
[url "ssh://aur@aur.archlinux.org/"]
    pushInsteadOf = "aur:"
[url "git@arf:jakob/"]
    insteadOf = "arf:"
[url "git@github.com:jakobbbb/"]
    insteadOf = "gh:"

Configuration for git send-email. Note that, by default, the E-Mail is CCed to yourself.

[sendemail]
    smtpEncryption = tls
    smtpServer = smtp.example.com
    smtpUser = user@example.org
    smtpServerPort = 587

None of that merge rubbish.

[pull]
    rebase = true

Global gitignore:

[core]
    excludesfile = /home/jakob/.config/git/ignore