2019-10-26 20:05:31 +03:00
|
|
|
[user]
|
2023-05-25 08:44:50 +03:00
|
|
|
{%@@ if profile == "mko-laptop" @@%}
|
|
|
|
email = marko.korhonen@rossum.fi
|
|
|
|
{%@@ else @@%}
|
|
|
|
email = marko@korhonen.cc
|
|
|
|
{%@@ endif @@%}
|
|
|
|
name = Marko Korhonen
|
|
|
|
signingkey = F2B9F713E7ED627336DD85E444FA3F28CD931BB0
|
2020-01-21 19:19:44 +02:00
|
|
|
|
2019-10-26 20:05:31 +03:00
|
|
|
[commit]
|
2023-05-25 08:44:50 +03:00
|
|
|
signoff = true
|
|
|
|
gpgsign = true
|
2020-06-27 11:07:51 +03:00
|
|
|
|
2020-01-21 17:32:35 +02:00
|
|
|
[tag]
|
2023-05-25 08:44:50 +03:00
|
|
|
gpgSign = true
|
|
|
|
signoff = true
|
2020-06-27 11:07:51 +03:00
|
|
|
|
2020-01-21 19:19:44 +02:00
|
|
|
[format]
|
2023-05-25 08:44:50 +03:00
|
|
|
signoff = true
|
2020-01-21 19:19:44 +02:00
|
|
|
|
|
|
|
[merge]
|
2023-05-25 08:44:50 +03:00
|
|
|
prompt = false
|
|
|
|
conflictstyle = diff3
|
|
|
|
tool = nvim
|
2021-08-17 17:43:30 +03:00
|
|
|
|
2023-05-23 22:04:32 +03:00
|
|
|
[mergetool]
|
2023-05-25 08:44:50 +03:00
|
|
|
keepBackup = false
|
|
|
|
prompt = false
|
2023-05-23 22:04:32 +03:00
|
|
|
|
|
|
|
[mergetool "nvim"]
|
2024-01-24 13:51:39 +02:00
|
|
|
cmd = nvim +DiffviewOpen
|
2023-05-23 22:04:32 +03:00
|
|
|
|
2020-06-27 11:07:51 +03:00
|
|
|
[pull]
|
2023-05-25 08:44:50 +03:00
|
|
|
rebase = merges
|
2021-08-10 11:31:19 +03:00
|
|
|
|
|
|
|
[alias]
|
2023-05-25 08:44:50 +03:00
|
|
|
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
|
2023-08-21 16:58:18 +03:00
|
|
|
recommit = !git commit -eF $(git rev-parse --git-dir)/COMMIT_EDITMSG
|
2021-08-17 17:43:30 +03:00
|
|
|
|
|
|
|
[color]
|
2023-05-25 08:44:50 +03:00
|
|
|
pager = no
|
2022-06-11 23:33:21 +03:00
|
|
|
|
|
|
|
[init]
|
2023-05-25 08:44:50 +03:00
|
|
|
defaultBranch = main
|
2022-09-06 11:38:00 +03:00
|
|
|
|
|
|
|
[credential]
|
2023-05-25 08:44:50 +03:00
|
|
|
helper = cache --timeout=600
|
|
|
|
helper = !pass-git-helper $@
|
2022-11-04 12:49:22 +02:00
|
|
|
|
|
|
|
[rerere]
|
2023-05-25 08:44:50 +03:00
|
|
|
enabled = true
|
2023-11-07 14:07:52 +02:00
|
|
|
|
|
|
|
[submodule]
|
|
|
|
recurse = true
|
2023-11-07 14:16:03 +02:00
|
|
|
|
|
|
|
[push]
|
|
|
|
recurseSubmodules = check
|