summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--.config/git/config2
1 files changed, 2 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config
index 0a5c940..1c9218b 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -17,3 +17,5 @@
 	editor = interactive-rebase-tool
 [credential]
 	helper = cache --timeout 3600
+[pull]
+	rebase = false