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

git: Some improvements to git configuration

Browse source 
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
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
git/.gitconfig
View file

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