[user] email = felix.vanderjeugt@posteo.net name = Felix Van der Jeugt signingkey = 68FF561137C38F9618E97339AF25A2C2862AA368 [pull] rebase = true [merge] conflictstyle = diff3 [push] default = simple followTags = true [gpg] program = gpg2 [commit] gpgsign = true [pager] status = true [alias] pf = push --force-with-lease lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit ff = merge --ff-only @{upstream} co = checkout jn = merge --no-ff --log --edit s = status -vv [rebase] autoSquash = true [rerere] enabled = true