aboutsummaryrefslogtreecommitdiff
path: root/gitconfig
diff options
context:
space:
mode:
Diffstat (limited to 'gitconfig')
-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