gitconfig: ff only

diff --git a/base/.gitconfig b/base/.gitconfig
index a2804ded980a8ef3d389e217325084bd27db0856..91550b24b3beea92b18061e6188511e8555d18f8 100644 (file)
--- a/base/.gitconfig
+++ b/base/.gitconfig
@@ -5,3 +5,5 @@
 [alias]
        push-all = !git remote | xargs -n1 git push
        submodules-pull = submodule foreach git pull origin master
+[pull]
+       ff = only