diff options
Diffstat (limited to '.mrconfig.in')
| -rw-r--r-- | .mrconfig.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/.mrconfig.in b/.mrconfig.in index cf2cd17e..269d259f 100644 --- a/.mrconfig.in +++ b/.mrconfig.in @@ -747,18 +747,18 @@ checkout = git clone demeterp:realloc realloc skip = ! mine [lib/nmbug-spw] -checkout = nmbug-spw clone demeterp:nmbug-spw -update = nmbug-spw pull -push = nmbug-spw push -sync = mr autoci; nmbug-spw pull && nmbug-spw push +checkout = notmuch git clone demeterp:nmbug-spw +update = notmuch git pull +push = notmuch git push +sync = mr autoci; notmuch git pull && notmuch git push status = - nmbug-spw status | grep -v "^U\s" || true + notmuch git status | grep -v "^U\s" || true # `nmbug status` does not catch committed but unpushed changes git --no-pager log --branches \ --not --remotes \ --simplify-by-decoration --decorate --oneline -log = nmbug-spw log -commit = nmbug-spw commit +log = notmuch git log +commit = notmuch git commit # Should be safe to commit a small number of local changes. We're # trying to avoid: # - wiping out git because db contains no spw:: tags (`nmbug @@ -766,13 +766,13 @@ commit = nmbug-spw commit # - doing any committing when there are known remote changes. # # TODO (Script to) periodically drop old spw::killed tags from repo. This -# should speed up nmbug-spw runs on athena. Might need to adjust autoci, +# should speed up 'notmuch git' runs on athena. Might need to adjust autoci, # however, as dropping the tags might mean there are less than 500 tags left, # in which case the current check would not protect us from wiping out git # when `nmbug checkout` is needed. autoci = - nmbug-spw status | perl -ne'/^[AD][ad]?\s/ and $i++ > 500 and exit 1' \ - && nmbug-spw commit + notmuch git status | perl -ne'/^[AD][ad]?\s/ and $i++ > 500 and exit 1' \ + && notmuch git commit skip = ! [ -e "$HOME/local/auth/fmailsyncpass" ] # --- my personal documents. Override my global update command back |