-git checkout -b make-upstream upstream
-echo upstream-v2 >>docs/README
-git commit -a -m "an upstream v2 update"
-ust=example_2.0.orig.tar.gz
-git archive -o ../$ust --prefix=example-2.0/ make-upstream
+git branch make-upstream upstream
+t-make-new-upstream-tarball 2.0
+
+: 'make branch names more conventional'
+git branch -D master
+git branch -m quilt-tip master
+
+for b in \
+ quilt-tip-2 \
+ gitish-only \
+ quilt-tip-1.1 \
+ patch-queue/quilt-tip \
+ indep-arch \
+; do
+ git branch -D $b
+done