summaryrefslogtreecommitdiff
path: root/lib-src/mr/config
diff options
context:
space:
mode:
Diffstat (limited to 'lib-src/mr/config')
-rw-r--r--lib-src/mr/config2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib-src/mr/config b/lib-src/mr/config
index a4c8a760..9994a006 100644
--- a/lib-src/mr/config
+++ b/lib-src/mr/config
@@ -701,6 +701,8 @@ autoci = doccheckin || true
# quick syncs
sync = doccheckin && git pull --no-edit && git push
+fixups = git config branch.master.rebase false
+
# --- static websites on web host boxes
[public_html]