summaryrefslogtreecommitdiff
path: root/.mrconfig.in
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2022-04-07 11:07:46 -0700
committerSean Whitton <spwhitton@spwhitton.name>2022-04-07 11:08:05 -0700
commit3393913b94ecf7e9af7229eff55e9986990a79be (patch)
tree8ce061e0fb9989024ce5cf67d5ae803ebe3c96f4 /.mrconfig.in
parent3d3b49abdd5d227532a4cf6334d1976864c017a4 (diff)
downloaddotfiles-3393913b94ecf7e9af7229eff55e9986990a79be.tar.gz
src/emacs: set rebase for 'master' branch
Diffstat (limited to '.mrconfig.in')
-rw-r--r--.mrconfig.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mrconfig.in b/.mrconfig.in
index 3fd25c0d..ad4df9a7 100644
--- a/.mrconfig.in
+++ b/.mrconfig.in
@@ -490,6 +490,7 @@ post_checkout =
fixups =
git rev-parse melete@{upstream} >/dev/null 2>&1 \
&& git branch --unset-upstream melete
+ git config branch.master.rebase true
git config branch.melete.rebase true
git config branch.melete.pushRemote demeter
git config --replace-all remote.demeter.push ":" "^:$"