From b16da8da5a8589433bd2a70d575cfa5c7cf6c1a1 Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Sat, 4 Apr 2020 02:40:41 -0700 Subject: [PATCH] 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 --- justfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/justfile b/justfile index 9bc4802..acefcce 100644 --- a/justfile +++ b/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