.gitconfig: Maintain default `pull` behavior of ff-only

diff --git a/.gitconfig b/.gitconfig
index b783b86cae0d80749bb2c831efd9839a24e93bd1..9cb3982584153ec0558231b0e615ec2a849680fe 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -88,6 +88,10 @@
        newNormal = nobold
        newHighlight = green bold black
 
        newNormal = nobold
        newHighlight = green bold black
 

+[pull]
+       rebase = false
+       ff = only
+

 [push]
        default = matching
 
 [push]
        default = matching