diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-04 14:18:44 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-04 14:18:44 -0700 |
| commit | 6b0bb4716f8f5e4f70c446d30a126616141e3b32 (patch) | |
| tree | 4550501409fa6e184cb2428858eb0568867a1aba /.mrconfig.in | |
| parent | 1e20ac241942d40f3afe32e5c4045ae687ddf285 (diff) | |
| download | dotfiles-6b0bb4716f8f5e4f70c446d30a126616141e3b32.tar.gz | |
have 'mr pull' for emacs.git also update demeter & shorten comment
The idea is that after this forced push, subsequent pushes will usually not
require forcing.
Diffstat (limited to '.mrconfig.in')
| -rw-r--r-- | .mrconfig.in | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/.mrconfig.in b/.mrconfig.in index b00316a3..ed3c0e59 100644 --- a/.mrconfig.in +++ b/.mrconfig.in @@ -441,11 +441,10 @@ fixups = git config --replace-all remote.demeter.push "+melete:melete" "^\+melete:melete$" # 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 to update melete from its upstream, we -# use either "F|r e origin/master RET" or 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 origin master +# (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 origin master && git push -f demeter melete skip = ! workstation [src/elpa] |