2019-10-26 17:05:31 +00:00
|
|
|
[user]
|
2021-07-16 08:28:57 +00:00
|
|
|
{%@@ if profile == "mko-laptop" @@%}
|
|
|
|
|
email = marko.korhonen@rossum.fi
|
|
|
|
|
{%@@ else @@%}
|
2020-11-25 08:19:18 +00:00
|
|
|
email = marko@korhonen.cc
|
2021-07-16 08:28:57 +00:00
|
|
|
{%@@ endif @@%}
|
2019-10-26 17:05:31 +00:00
|
|
|
name = Marko Korhonen
|
|
|
|
|
signingkey = C514037F1EFF4FA6
|
2020-01-21 17:19:44 +00:00
|
|
|
|
2019-10-26 17:05:31 +00:00
|
|
|
[commit]
|
|
|
|
|
signoff = true
|
|
|
|
|
gpgsign = true
|
2020-06-27 08:07:51 +00:00
|
|
|
|
2020-01-21 15:32:35 +00:00
|
|
|
[tag]
|
|
|
|
|
gpgSign = true
|
|
|
|
|
signoff = true
|
2020-06-27 08:07:51 +00:00
|
|
|
|
2020-01-21 17:19:44 +00:00
|
|
|
[format]
|
|
|
|
|
signoff = true
|
|
|
|
|
|
|
|
|
|
[merge]
|
|
|
|
|
prompt = false
|
|
|
|
|
tool = nvim-merge
|
2021-08-17 14:43:30 +00:00
|
|
|
|
2020-01-21 17:19:44 +00:00
|
|
|
[mergetool "nvim-merge"]
|
|
|
|
|
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
2021-11-30 14:56:15 +00:00
|
|
|
keepBackup = false
|
2020-01-21 17:19:44 +00:00
|
|
|
|
|
|
|
|
[diff]
|
|
|
|
|
prompt = false
|
|
|
|
|
tool = nvim-diff
|
2020-06-27 08:07:51 +00:00
|
|
|
|
2020-01-21 17:19:44 +00:00
|
|
|
[difftool "nvim-diff"]
|
2021-08-18 06:30:09 +00:00
|
|
|
cmd = nvim -d -R
|
2020-06-27 08:07:51 +00:00
|
|
|
|
|
|
|
|
[pull]
|
2021-05-18 06:03:12 +00:00
|
|
|
rebase = merges
|
2021-08-10 08:31:19 +00:00
|
|
|
|
|
|
|
|
[alias]
|
2021-11-02 08:20:28 +00:00
|
|
|
mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1
|
2022-04-26 10:45:16 +00:00
|
|
|
upstream = !git push -u origin HEAD
|
2022-06-09 07:29:43 +00:00
|
|
|
sync = !git pull && git push
|
2021-08-17 14:43:30 +00:00
|
|
|
|
|
|
|
|
[color]
|
|
|
|
|
pager = no
|
2022-06-11 20:33:21 +00:00
|
|
|
|
|
|
|
|
[init]
|
|
|
|
|
defaultBranch = main
|
