Marko Korhonen
e3e9848d0e
This is because as a git tool, it wants to open each file separately. Neovim and diffview plugin provide a handy UI to manage multiple files in diff and merge
60 lines
935 B
Plaintext
60 lines
935 B
Plaintext
[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
|
|
|
|
[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
|
|
|
|
[color]
|
|
pager = no
|
|
|
|
[init]
|
|
defaultBranch = main
|
|
|
|
[credential]
|
|
helper = cache --timeout=600
|
|
helper = !pass-git-helper $@
|
|
|
|
[rerere]
|
|
enabled = true
|
|
|
|
[submodule]
|
|
recurse = true
|
|
|
|
[push]
|
|
recurseSubmodules = check
|