aboutsummaryrefslogtreecommitdiffstats
path: root/git
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2017-11-27 12:59:13 +0100
committerJohannes Löthberg <johannes@kyriasis.com>2017-11-27 12:59:13 +0100
commitb14656523088e77c103895baadc7f1573ff1f89b (patch)
tree47d20e18dc6e5c0de0cdf7ef833e9c071b327f9d /git
parented5a898294ec3bdd7f3fc081443036e27558f9e5 (diff)
downloaddotfiles-b14656523088e77c103895baadc7f1573ff1f89b.tar.xz
git/config: set pull.rebase to preserve
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
Diffstat (limited to 'git')
-rw-r--r--git/config3
1 files changed, 3 insertions, 0 deletions
diff --git a/git/config b/git/config
index ee78039..b4f6cb9 100644
--- a/git/config
+++ b/git/config
@@ -96,6 +96,9 @@
[push]
default = simple
+[pull]
+ rebase = preserve
+
[repack]
writebitmaps = true
autosquash = true