summaryrefslogtreecommitdiff
path: root/git/.gitconfig
diff options
context:
space:
mode:
Diffstat (limited to 'git/.gitconfig')
-rw-r--r--git/.gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/git/.gitconfig b/git/.gitconfig
index 1169c34..79e64f8 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -19,3 +19,5 @@
default = simple
[merge]
ff = true
+[pull]
+ rebase = false