X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-applymbox.sh;h=c686cc8d27a64998c141cca2989375910601f90f;hb=eaa54efc619879ef0d0f7b95f5357d8dab86a713;hp=6de6932879e9f1298f69e2826f13e1ee231ecea0;hpb=1301c6eb412e7c5511b952a12e42c70ad56f028b;p=git.git

diff --git a/git-applymbox.sh b/git-applymbox.sh
index 6de69328..c686cc8d 100755
--- a/git-applymbox.sh
+++ b/git-applymbox.sh
@@ -18,7 +18,7 @@
 ##
 ## git-am is supposed to be the newer and better tool for this job.
 
-. git-sh-setup || die "Not a git archive"
+. git-sh-setup
 
 usage () {
     echo >&2 "applymbox [-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]"
@@ -33,7 +33,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