summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2022-08-06 09:47:37 -0700
committerSean Whitton <spwhitton@spwhitton.name>2022-08-06 09:47:47 -0700
commita7ad238e8b290f12311992b0bf5ad2074f41780b (patch)
treee3e702855bdd63d008aac3c1f2b702fd48dbeb66
parentdd0f0489921444a77e4b204823c64c5703bec706 (diff)
downloaddotfiles-a7ad238e8b290f12311992b0bf5ad2074f41780b.tar.gz
Revert "don't skip ~/src/emacs on athena"
-rw-r--r--.mrconfig.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/.mrconfig.in b/.mrconfig.in
index 0af23e33..7c7b5a2a 100644
--- a/.mrconfig.in
+++ b/.mrconfig.in
@@ -520,7 +520,7 @@ fixups =
# 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 = ! mine
+skip = ! workstation
[src/elpa]
checkout = git clone https://git.savannah.gnu.org/git/emacs/elpa.git elpa