Rewrite done
recipe for new merge workflow
The new sign-preserving merge workflow is to just wait until commits pass CI, and then push directly to master on GitHub. type: development
This commit is contained in:
parent
9d43fa4275
commit
b16da8da5a
7
justfile
7
justfile
|
@ -25,11 +25,12 @@ push: check
|
|||
|
||||
# clean up feature branch BRANCH
|
||||
done BRANCH=`git rev-parse --abbrev-ref HEAD`:
|
||||
git checkout master
|
||||
git diff --no-ext-diff --quiet --exit-code
|
||||
git pull --rebase github master
|
||||
git push github {{BRANCH}}:master
|
||||
git checkout master
|
||||
git rebase {{BRANCH}}
|
||||
git diff --no-ext-diff --quiet --exit-code {{BRANCH}} --
|
||||
git branch -D {{BRANCH}}
|
||||
git branch -d {{BRANCH}}
|
||||
|
||||
test:
|
||||
cargo test --all
|
||||
|
|
Loading…
Reference in New Issue
Block a user