summaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-03-18 11:21:11 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-03-18 11:21:11 -0700
commita20bafe57278208d109fe1cb17c605f9b99c5395 (patch)
tree3f679d6fa3645f9e7145055477f6d69a23d40e9d /.gitconfig
parent7b2cea8fc1f732cd9460f3f4ee0167445c4aa14f (diff)
downloaddotfiles-a20bafe57278208d109fe1cb17c605f9b99c5395.tar.gz
stop recent git from warning about lack of option to git-pull(1)
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 04eb2a6f..00fc3d9c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -49,6 +49,8 @@
default = upstream
# use `mr push` when want --follow-tags
followTags = false
+[pull]
+ rebase = false
# ---- URIs ----