aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Beltran del Rio <ruben@unlimited.pizza>2020-11-11 12:37:51 +0100
committerRuben Beltran del Rio <ruben@unlimited.pizza>2020-11-11 12:37:51 +0100
commit3422e7aace62f888ee801bf9ec80561f6fe7f20c (patch)
tree6e107014465308896fca605083086798eef0d6a7
parent46ec50103a00c044b1c5c932eb3e459a9925216c (diff)
Set rebase to false on pull from git
-rw-r--r--gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/gitconfig b/gitconfig
index 2f7f713..e60d8a9 100644
--- a/gitconfig
+++ b/gitconfig
@@ -8,5 +8,7 @@
diff = auto
[push]
default = simple
+[pull]
+ rebase = false
[commit]
gpgsign = true