rkmiec/yadm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Git: verbose commit by default, nvim as mergetool

Browse Source
This commit is contained in:
Robert Kmieć
2021-12-12 21:28:47 +01:00
parent cbe00fb78d
commit 348b953ff3
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitconfig
View File

@@ -37,6 +37,7 @@
d = diff d = diff
dc = diff --cached dc = diff --cached
short = rev-parse --short --verify HEAD short = rev-parse --short --verify HEAD
update = !git stash && git pull --rebase && git stash pop && git submodule update --init --recursive
[interactive] [interactive]
diffFilter = delta --color-only diffFilter = delta --color-only
[delta] [delta]
@@ -48,3 +49,7 @@
file-decoration-style = none file-decoration-style = none
[pull] [pull]
rebase = true rebase = true
[commit]
verbose = true
[mergetool "vimdiff"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'