summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2020-06-14 18:59:07 -0400
committerJesse Luehrs <doy@tozt.net>2020-06-14 18:59:07 -0400
commit30e57b9777eececfadd2d5f31a8f2fc57268c17b (patch)
tree8ca026301b50d5cf62eea91ca459258a14cb74be
parentcaf35036445bbb7bda6ac1df74c5216140f7514d (diff)
downloadconf-30e57b9777eececfadd2d5f31a8f2fc57268c17b.tar.gz
conf-30e57b9777eececfadd2d5f31a8f2fc57268c17b.zip
set pull.rebase to true
-rw-r--r--config/git/config2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/git/config b/config/git/config
index c08907e..30584de 100644
--- a/config/git/config
+++ b/config/git/config
@@ -68,6 +68,8 @@
diff = diff-highlight | less
[fetch]
prune = true
+[pull]
+ rebase = true
[include]
path = config.private