From 7f630a1bd9376e2461b55ac66126147277ab5dfe Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Sat, 4 Jan 2020 15:09:36 -0800 Subject: [PATCH] Add `done` recipe to justfile Safely delete a merged feature branch: 1. Check out `master` 2. Check that there are no pending changes 3. Rebase onto latest github master 4. Check that there are no changes relative to feature branch 5. Delete feature branch type: development --- justfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/justfile b/justfile index 773f475..f206d91 100644 --- a/justfile +++ b/justfile @@ -9,6 +9,14 @@ stats PATH: cargo build --release time ./target/release/imdl --unstable torrent stats --input {{PATH}} +# clean up feature branch BRANCH +done BRANCH: + git checkout master + git diff --no-ext-diff --quiet --exit-code + git pull --rebase github master + git diff --no-ext-diff --quiet --exit-code {{BRANCH}} + git branch -D {{BRANCH}} + # retrieve large collection of torrents from the Internet Archive get-torrents: aria2c \