.gitconfig: Maintain default `pull` behavior of ff-only
authorTony Duckles <tony@nynim.org>
Fri, 27 Nov 2020 18:09:46 +0000
committerTony Duckles <tony@nynim.org>
Fri, 27 Nov 2020 18:09:46 +0000
.gitconfig

index b783b86cae0d80749bb2c831efd9839a24e93bd1..9cb3982584153ec0558231b0e615ec2a849680fe 100644 (file)
        newNormal = nobold
        newHighlight = green bold black
 
        newNormal = nobold
        newHighlight = green bold black
 
+[pull]
+       rebase = false
+       ff = only
+
 [push]
        default = matching
 
 [push]
        default = matching