X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-applymbox.sh;h=61c8c024c60935b4766b5052461b4c73918a69ec;hb=abb7c7b31c0896bd838bbb6437b310db5a42227a;hp=24d4a8cb4eb95a5201c205be879d3ac6a62a8a15;hpb=36d277c72d90d32f99616072b64a2652248f5264;p=git.git

diff --git a/git-applymbox.sh b/git-applymbox.sh
index 24d4a8cb..61c8c024 100755
--- a/git-applymbox.sh
+++ b/git-applymbox.sh
@@ -18,13 +18,9 @@
 ##
 ## git-am is supposed to be the newer and better tool for this job.
 
+USAGE='[-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]'
 . git-sh-setup
 
-usage () {
-    echo >&2 "applymbox [-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]"
-    exit 1
-}
-
 keep_subject= query_apply= continue= utf8= resume=t
 while case "$#" in 0) break ;; esac
 do
@@ -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