[user] email = marko.korhonen@rossum.fi name = Marko Korhonen signingkey = F2B9F713E7ED627336DD85E444FA3F28CD931BB0 [commit] signoff = true gpgsign = true [tag] gpgSign = true signoff = true [format] signoff = true [merge] prompt = false conflictstyle = diff3 tool = nvim [mergetool] keepBackup = false prompt = false [mergetool "nvim"] cmd = nvim +DiffviewOpen [pull] rebase = merges [alias] mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 upstream = !git push -u origin HEAD sync = !git pull && git push recommit = !git commit -eF $(git rev-parse --git-dir)/COMMIT_EDITMSG pull-merge = pull --no-rebase --no-ff --no-edit log-merge = log -i --grep=merge --pretty=oneline log-fp = log --first-parent --pretty=oneline ll = log --pretty=oneline [color] pager = no [init] defaultBranch = main [credential] helper = cache --timeout=600 helper = !pass-git-helper $@ [rerere] enabled = true [submodule] recurse = true [push] recurseSubmodules = check