mirror of
https://github.com/Matir/skel.git
synced 2026-05-25 21:19:09 -07:00
Set git pull to merge, not rebase.
This commit is contained in:
@@ -67,3 +67,5 @@
|
|||||||
prompt = false
|
prompt = false
|
||||||
[include]
|
[include]
|
||||||
path = ~/.gitconfig.local
|
path = ~/.gitconfig.local
|
||||||
|
[pull]
|
||||||
|
rebase = false
|
||||||
|
|||||||
Reference in New Issue
Block a user