git: Some improvements to git configuration

Use fast forward only for merge, auto stash when doing rebase and take
care of tags when doing a push.
This commit is contained in:
Sanchayan Maity 2020-10-01 13:32:01 +05:30
parent 2914f7e97d
commit 39e9b824a6

View file

@ -19,16 +19,21 @@
[merge]
tool = vimdiff3
conflictstyle = diff3
ff = only
[mergetool]
prompt = false
[mergetool "vimdiff"]
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
trustExitCode = true
keepBackup = false
[rebase]
autoStash = true
[commit]
verbose = true
[pull]
rebase = false
[push]
followTags = true
[interactive]
diffFilter = delta --color-only
[delta]