git checkout -b tpristine || git checkout tpristine
git reset --hard $APP-$PRIOR
-DATE=`git show tmaster --format="format:%cd" | head -n1`
+DATE=`git show tmaster --pretty="format:%cd" | head -n1`
export GIT_AUTHOR_DATE="$DATE"
export GIT_COMMITTER_DATE="$DATE"
git tag $APP-$VERSION
git checkout tmaster
-git merge tpristine --no-commit || bash || true
+git merge tpristine --no-commit || (echo "Dropping into shell; exit when complete." && bash) || true
git commit -asm "$APPLICATION $VERSION-scripts"
git tag $APP-$VERSION-scripts