mandlm/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged coc-settings

Browse source
This commit is contained in:
Michael Mandl 2021-01-13 08:54:31 +01:00
parent 35e1aae000
commit d8be2b09ac
Signed by: mandlm
GPG key ID: 4AA25D647AA54CC7
4 changed files with 32 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
git/gitconfig
View file

@ -4,6 +4,14 @@
name = changeme
email = changeme
signingkey = changeme
[user "private"]
name = Michael Mandl
email = mandlm@molez.net
signingkey = 4AA25D647AA54CC7
[user "swp"]
name = Michael Mandl
email = mandl@vi-bim.de
signingkey = 4E60F44227F611B4
[alias]
identity = "! git config user.name \"$(git config user.$1.name)\"; git config user.email \"$(git config user.$1.email)\"; git config user.signingkey \"$(git config user.$1.signingkey)\"; :"
[commit]
@ -17,6 +25,7 @@
pager = less -S -x1,5
whitespace = cr-at-eol
excludesfile = ~/.gitignore
hookspath = /mnt/d/SWP/devtools/userhooks
[rebase]
autostash = true
[color "diff"]
@ -32,6 +41,8 @@
tool = vimdiff
[difftool "vimdiff"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[mergetool "vimdiff"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[difftool]
prompt = false
[gitflow]
@ -50,8 +61,12 @@
date = relative
[format]
pretty = format:%C(yellow)%h %Cblue%>(12)%ad %C(red)%G? %Cgreen%<(7,trunc)%aN%Cred%d %Creset%s
[merge]
tool = bc
[mergetool "nvim"]
cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
[mergetool "bc"]
path = /mnt/c/Program Files/Beyond Compare 4/BComp.exe
[rerere]
enabled = true
[fetch]