sysadmin/dotfiles
1
0
Fork 0
Code Issues Pull requests 1 Activity

disable rebase strategy for pulls in git

Browse source
This commit is contained in:
Bruno Carlin 2020-06-10 17:00:06 +02:00
parent e47bddb619
commit d25215793d
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git/.gitconfig
View file

@ -31,3 +31,5 @@
[merge] [merge]
tool = vimdiff tool = vimdiff
guitool = meld guitool = meld
[pull]
rebase = false