chore: update gitconfig
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
[user]
|
[user]
|
||||||
email = madundead@gmail.com
|
email = madundead@gmail.com
|
||||||
name = Konstantin Bukley
|
name = Kostiantyn Bukliei
|
||||||
|
|
||||||
[includeIf "gitdir:~/Development/work/"]
|
[includeIf "gitdir:~/Development/work/"]
|
||||||
path = ~/Development/work/.gitconfig
|
path = ~/Development/work/.gitconfig
|
||||||
@@ -114,11 +114,11 @@
|
|||||||
remote = green
|
remote = green
|
||||||
|
|
||||||
[color "diff"]
|
[color "diff"]
|
||||||
meta = yellow
|
meta = yellow
|
||||||
frag = magenta bold
|
frag = magenta bold
|
||||||
old = red bold
|
old = red bold
|
||||||
commit = yellow bold
|
commit = yellow bold
|
||||||
whitespace = red reverse
|
whitespace = red reverse
|
||||||
|
|
||||||
[color "status"]
|
[color "status"]
|
||||||
added = yellow
|
added = yellow
|
||||||
@@ -173,12 +173,12 @@
|
|||||||
markEmptyLines = false
|
markEmptyLines = false
|
||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
tool = nvim
|
tool = nvim
|
||||||
|
|
||||||
[mergetool]
|
[mergetool]
|
||||||
keepBackup = false
|
keepBackup = false
|
||||||
|
|
||||||
[mergetool "nvim"]
|
[mergetool "nvim"]
|
||||||
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
||||||
[pull]
|
[pull]
|
||||||
default = current
|
default = current
|
||||||
|
|||||||
Reference in New Issue
Block a user