Move git config to standard xdg path out of home directory
This commit is contained in:
parent
69cabe05e5
commit
c0d8b72f0e
2 changed files with 2 additions and 2 deletions
48
home/.config/git/config
Normal file
48
home/.config/git/config
Normal file
|
@ -0,0 +1,48 @@
|
|||
[user]
|
||||
{%@@ if profile == "mko-laptop" @@%}
|
||||
email = marko.korhonen@rossum.fi
|
||||
{%@@ else @@%}
|
||||
email = marko@korhonen.cc
|
||||
{%@@ endif @@%}
|
||||
name = Marko Korhonen
|
||||
signingkey = C514037F1EFF4FA6
|
||||
|
||||
[commit]
|
||||
signoff = true
|
||||
gpgsign = true
|
||||
|
||||
[tag]
|
||||
gpgSign = true
|
||||
signoff = true
|
||||
|
||||
[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
|
||||
|
||||
[difftool "nvim-diff"]
|
||||
cmd = nvim -d -R
|
||||
|
||||
[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
|
||||
|
||||
[color]
|
||||
pager = no
|
||||
|
||||
[init]
|
||||
defaultBranch = main
|
Loading…
Add table
Add a link
Reference in a new issue