Migrate from .stow-rename to --dotfiles

dot-local/bin/git-finish

@@ -0,0 +1,26 @@
+#!/bin/zsh
+branch=$1
+branchParts=( ${(s:/:)branch} )
+kind=$branchParts[1]
+name=$branchParts[2]
+
+pullreq=$2
+[[ -n pullreq ]] && pullreq=" (pull request #$pullreq)"
+
+echo "Finishing $kind '$name'$pullreq..." >&2
+
+git checkout $branch || exit $?
+
+merge-into() {
+	echo "Merging $branch into $1..." >&2
+	git checkout $1 || exit $?
+	git merge --ff-only || exit $?
+	git merge --no-ff $branch --message "Merge $kind '$name'$pullreq into $1" || exit $?
+}
+
+[[ $kind = feature ]] || merge-into master
+merge-into develop
+
+echo "Merge successful, deleting $branch..." >&2
+git push origin --delete $branch || exit $?
+git branch --delete $branch

dot-local/bin/gpg-for-git-signing

@@ -0,0 +1,13 @@
+#!/bin/zsh
+# There's a weird inconsistency between the --default-key and --local-user
+# arguments: when you have multiple signing subkeys, --local-user chooses the
+# newest, and --default-key chooses the one that's available. The latter is
+# clearly preferable. So we shuffle the arguments around a little.
+for arg; do
+	if [[ $arg = -bsau ]]; then
+		args+=(-bsa --default-key)
+	else
+		args+=($arg)
+	fi
+done
+exec gpg --no-tty "${(@)args}"