dotfiles/home/.config/git/config

66 lines
1 KiB
Plaintext
Raw Normal View History

[user]
{%@@ if profile == "mko-laptop" @@%}
email = marko.korhonen@rossum.fi
{%@@ else @@%}
email = marko@korhonen.cc
{%@@ endif @@%}
name = Marko Korhonen
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
conflictstyle = diff3
tool = nvim
2023-05-23 22:04:32 +03:00
[mergetool]
keepBackup = false
prompt = false
2023-05-23 22:04:32 +03:00
[mergetool "nvim"]
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
2023-05-23 22:04:32 +03:00
[diff]
tool = nvim
2023-05-23 22:04:32 +03:00
[difftool]
prompt = false
2020-06-27 11:07:51 +03:00
2023-05-23 22:04:32 +03:00
[difftool "nvim"]
cmd = nvim -d $LOCAL $REMOTE
2020-06-27 11:07:51 +03:00
[pull]
rebase = merges
2021-08-10 11:31:19 +03:00
[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
2023-08-21 16:58:18 +03:00
recommit = !git commit -eF $(git rev-parse --git-dir)/COMMIT_EDITMSG
[color]
pager = no
[init]
defaultBranch = main
2022-09-06 11:38:00 +03:00
[credential]
helper = cache --timeout=600
helper = !pass-git-helper $@
2022-11-04 12:49:22 +02:00
[rerere]
enabled = true
[submodule]
recurse = true