summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Holman <dholman@gymli.xyz>2020-06-19 21:58:22 -0500
committerDanny Holman <dholman@gymli.xyz>2020-06-19 21:58:22 -0500
commit8c6ce4a45dbfe315b28c0d79630e3bc502dcc12a (patch)
treecbb3f44e724774352d032df4a7006f131118136a
parent6541def257d613f8e775f6b2c7cbf35de092163c (diff)
Don't bother me about 'git pull'
Don't bother me with warnings about divergent branches when I run 'git pull', just do the default thing and leave me alone.
-rw-r--r--.gitconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 5dd415b..bf77822 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -7,3 +7,6 @@
smtpserver = mail.gymli.org
smtpuser = dholman
smtpserverport = 587
+
+[pull]
+ rebase = false