dotfiles/home/.config/git/config

53 lines
902 B
Text
Raw Normal View History

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