Improve the done and merge recipes

- Rebase master branch without checking it out
- Don't check for no changes, since we're using `-d`, which will fail on
  an unmerge branch.
- Make merge take an argument, so it can be used with something other
  than the current branch.

type: development

CHANGELOG.md

@@ -2,9 +2,10 @@ Changelog
 =========
 
 
-UNRELEASED - 2020-04-23
+UNRELEASED - 2020-04-24
 -----------------------
-- :wrench: [`xxxxxxxxxxxx`](https://github.com/casey/intermodal/commits/master) Don't invalid build cache when `Cargo.lock` changes - _Casey Rodarmor <casey@rodarmor.com>_
+- :wrench: [`xxxxxxxxxxxx`](https://github.com/casey/intermodal/commits/master) Improve the done and merge recipes - _Casey Rodarmor <casey@rodarmor.com>_
+- :wrench: [`97ee5684f8e0`](https://github.com/casey/intermodal/commit/97ee5684f8e0f8de7dbdb4f930018c8df0f012b1) Don't invalid build cache when `Cargo.lock` changes - _Casey Rodarmor <casey@rodarmor.com>_
 - :books: [`c75ec39b14bb`](https://github.com/casey/intermodal/commit/c75ec39b14bb4375a875d2d2c73718b44eb54e12) Remove watch dropdown image from readme - _Casey Rodarmor <casey@rodarmor.com>_
 - :books: [`8fbe39726fe6`](https://github.com/casey/intermodal/commit/8fbe39726fe6c5bdc342dbd0764f8052ddd03597) Add notes for packagers to readme - _Casey Rodarmor <casey@rodarmor.com>_
 - :bug: [`43788cac9a0c`](https://github.com/casey/intermodal/commit/43788cac9a0cb957605fbd16299d04d36a7e0411) Fix `bin/package` - _Casey Rodarmor <casey@rodarmor.com>_

justfile

@@ -25,11 +25,8 @@ push:
 
 # clean up feature branch BRANCH
 done BRANCH=`git rev-parse --abbrev-ref HEAD`:
-	git diff --no-ext-diff --quiet --exit-code
 	git push github {{BRANCH}}:master
-	git checkout master
-	git rebase {{BRANCH}}
-	git diff --no-ext-diff --quiet --exit-code {{BRANCH}} --
+	git rebase github/master master
 	git branch -d {{BRANCH}}
 
 test:
@@ -76,13 +73,13 @@ draft: push
 pr: check push
 	hub pull-request -o
 
-merge:
+merge BRANCH=`git rev-parse --abbrev-ref HEAD`:
 	#!/usr/bin/env bash
 	set -euxo pipefail
-	while ! hub ci-status --verbose; do
+	while ! hub ci-status --verbose {{BRANCH}}; do
 		sleep 5
 	done
-	just done
+	just done {{BRANCH}}
 
 publish-check: check
 	cargo outdated --exit-code 1