diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-12 11:27:32 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-12 11:27:52 -0700 |
| commit | 2311e8c15b6501d221799091b3dcedc4fb83ef8b (patch) | |
| tree | da584e579bc33b34e8a7213955bc419d38472f36 /.mrconfig.in | |
| parent | 3ae4ebd8f6519f3453a312d4a1bdf5ecccdf0fb7 (diff) | |
| download | dotfiles-2311e8c15b6501d221799091b3dcedc4fb83ef8b.tar.gz | |
src/emacs melete branch rebases: use --autostash
Diffstat (limited to '.mrconfig.in')
| -rw-r--r-- | .mrconfig.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.mrconfig.in b/.mrconfig.in index 728d19be..502468d7 100644 --- a/.mrconfig.in +++ b/.mrconfig.in @@ -500,7 +500,7 @@ fixups = # (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 +pull = git checkout melete && git pull --rebase --autostash origin master && git push -f demeter melete skip = ! workstation [src/elpa] |