summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorC. McEnroe <june@causal.agency>2020-07-20 13:47:38 -0400
committerC. McEnroe <june@causal.agency>2020-07-20 13:47:50 -0400
commite4ac888ae0369cf69cbd63515148077779a3230e (patch)
treed4249defc75956064d11998467a1163938b71d9a
parentRead from stdin in order (diff)
downloadsrc-e4ac888ae0369cf69cbd63515148077779a3230e.tar.gz
src-e4ac888ae0369cf69cbd63515148077779a3230e.zip
Set pull.rebase true
-rw-r--r--home/.config/git/config3
1 files changed, 3 insertions, 0 deletions
diff --git a/home/.config/git/config b/home/.config/git/config
index 5c12c079..71799784 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -8,6 +8,9 @@
[merge]
conflictStyle = diff3
+[pull]
+ rebase = true
+
[rebase]
autosquash = true