Git: automatically merge pulls

2020-07-20 16:44:39 -04:00 · 2020-07-20 16:44:39 -04:00 · c5ec5daca0
parent acaa527288
commit c5ec5daca0
1 changed files with 2 additions and 0 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -47,3 +47,5 @@
    s = status
    su = submodule update --init --recursive
    w = clean -fdx
+[pull]
+	rebase = false