diff options
| -rw-r--r-- | .mrconfig.in | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/.mrconfig.in b/.mrconfig.in index ee07785e..a8c726b0 100644 --- a/.mrconfig.in +++ b/.mrconfig.in @@ -554,12 +554,14 @@ fixups = git config branch.deb/emacs-non-dfsg/d/sid/master.dpmPatchedBranch \ deb/emacs-non-dfsg/d/sid/patched # We don't have the melete branch's upstream set to origin/master to avoid -# accidental attempts to push to upstream master by typing "P u" in magit -# (push.default cannot help here). So for convenient updates of melete to its -# upstream, we have this definition. "pull" not "update" because we want to -# update from upstream master deliberately, not as part of automated updates. -pull = git checkout melete && git pull --rebase --autostash origin master && git push -f demeter melete -skip = ! workstation +# accidentally pushing personal commits to Savannah (push.default cannot help +# here). So for convenient updates of melete to its conceptual upstream, we +# have this definition. "pull" not "update" because we want to update from +# upstream master deliberately, not as part of automated updates. +pull = git checkout melete \ + && git pull --rebase --autostash origin master \ + && git push -f demeter melete +skip = lazy || [ "$1" = pull ] && ! on spwhitton@melete [src/elpa] checkout = git clone https://git.savannah.gnu.org/git/emacs/elpa.git elpa |