summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2022-12-02 11:30:16 -0700
committerSean Whitton <spwhitton@spwhitton.name>2022-12-02 11:30:35 -0700
commit3b51f3095a1ccc1f15a6305be7d3c3cdbdc3e66c (patch)
treeb12897d2d5af94f6a90cc8bb3bc4026a1e0b190a /lib-src
parent53f40e0d7a396837ced2c3b83aad370ce1aa0776 (diff)
downloaddotfiles-3b51f3095a1ccc1f15a6305be7d3c3cdbdc3e66c.tar.gz
ensure C-x v + for ~/doc doesn't rebase
Diffstat (limited to 'lib-src')
-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]