X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-applymbox.sh;h=c686cc8d27a64998c141cca2989375910601f90f;hb=61f693bd5a2ab4d830aad6fce0a1c70863f38009;hp=4e77132ab5f73839241c430d6354d5abb8294d85;hpb=d06b689a933f6d2130f8afdf1ac0ddb83eeb59ab;p=git.git

diff --git a/git-applymbox.sh b/git-applymbox.sh
index 4e77132a..c686cc8d 100755
--- a/git-applymbox.sh
+++ b/git-applymbox.sh
@@ -15,8 +15,10 @@
 ## Pay a special attention to the commit log message if you do this and
 ## use a Signoff_file, because applypatch wants to append the sign-off
 ## message to msg-clean every time it is run.
+##
+## 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]"
@@ -31,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