]> git.r.bdr.sh - rbdr/dotfiles/commitdiff
Set rebase to false on pull from git
authorRuben Beltran del Rio <redacted>
Wed, 11 Nov 2020 11:37:51 +0000 (12:37 +0100)
committerRuben Beltran del Rio <redacted>
Wed, 11 Nov 2020 11:37:51 +0000 (12:37 +0100)
gitconfig

index 2f7f713fc3b9203f72c266d9540d62cb1b7e260e..e60d8a9c0c56a575f1dd9862f8454f39e842b56d 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -8,5 +8,7 @@
        diff = auto
 [push]
        default = simple
        diff = auto
 [push]
        default = simple
+[pull]
+  rebase = false
 [commit]
        gpgsign = true
 [commit]
        gpgsign = true