summary refs log tree commit diff stats
path: root/.config/git
diff options
context:
space:
mode:
authorBen Morrison <ben@gbmor.dev>2020-06-15 03:47:53 -0400
committerBen Morrison <ben@gbmor.dev>2020-06-15 03:47:53 -0400
commit9662e628fba032ab73dd4f2b90ff411443f4cc4a (patch)
tree70970ab76000fcd15c54b2ab348c6f5ef1bdf207 /.config/git
parent641a055147f2128bb27c66e11f652e80d72b01a1 (diff)
downloaddogfiles-9662e628fba032ab73dd4f2b90ff411443f4cc4a.tar.gz
git was complaining about this
Diffstat (limited to '.config/git')
-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