X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-applymbox.sh;h=61c8c024c60935b4766b5052461b4c73918a69ec;hb=b992933853ccffac85f7e40310167ef7b8f0432e;hp=6de6932879e9f1298f69e2826f13e1ee231ecea0;hpb=302ebfe52192fff9a2c1c612dff22325fd073acc;p=git.git

diff --git a/git-applymbox.sh b/git-applymbox.sh
index 6de69328..61c8c024 100755
--- a/git-applymbox.sh
+++ b/git-applymbox.sh
@@ -18,12 +18,8 @@
 ##
 ## git-am is supposed to be the newer and better tool for this job.
 
-. git-sh-setup || die "Not a git archive"
-
-usage () {
-    echo >&2 "applymbox [-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]"
-    exit 1
-}
+USAGE='[-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]'
+. git-sh-setup
 
 keep_subject= query_apply= continue= utf8= resume=t
 while case "$#" in 0) break ;; esac
@@ -33,7 +29,7 @@ do
 	-k)	keep_subject=-k ;;
 	-q)	query_apply=t ;;
 	-c)	continue="$2"; resume=f; shift ;;
-	-m)	fallback_3way=t ;;
+	-m)	fall_back_3way=t ;;
 	-*)	usage ;;
 	*)	break ;;
 	esac