55 lines
1.4 KiB
Plaintext
55 lines
1.4 KiB
Plaintext
[user]
|
|
email = astroshot@outlook.com
|
|
name = Shockwave
|
|
[commit]
|
|
template = ~/.config/git/commit-template.txt
|
|
[pull]
|
|
rebase = true
|
|
|
|
# my vim is a soft link of nvim
|
|
[core]
|
|
editor = nvim
|
|
# pager = delta
|
|
[diff]
|
|
tool = nvimdiff
|
|
[difftool "nvimdiff"]
|
|
cmd = nvim -d $LOCAL $REMOTE $MERGED -c "$wincmd w" -c "wincmd J"
|
|
|
|
# merge UI in vim will be like:
|
|
# +-------------------------------------+
|
|
# | | | |
|
|
# | LOCAL | BASE | REMOTE |
|
|
# | | | |
|
|
# +-------------------------------------+
|
|
# | |
|
|
# | |
|
|
# | MERGED |
|
|
# | |
|
|
# | |
|
|
# +-------------------------------------+
|
|
[merge]
|
|
tool = nvimdiff
|
|
[mergetool]
|
|
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c "$wincmd w" -c "$wincmd J"
|
|
keepBackup = false
|
|
|
|
# Don't use pager when type `git branch`
|
|
[pager]
|
|
branch = false
|
|
|
|
# [interactive]
|
|
# diffFilter = delta --color-only
|
|
|
|
# [delta]
|
|
# features = side-by-side line-numbers decorations
|
|
# whitespace-error-style = 22 reverse
|
|
# plus-style = "syntax #012800"
|
|
# minus-style = "syntax #340001"
|
|
# syntax-theme = Monokai Extended
|
|
# navigate = true
|
|
# linenumbers = true
|
|
# [delta "decorations"]
|
|
# commit-decoration-style = bold yellow box ul
|
|
# file-style = bold yellow ul
|
|
# file-decoration-style = none
|