diff --git a/git-am.sh b/git-am.sh
index 2b5bbb772ae9e3ac716210b3e19eef64f70f0944..18468769c1e247cec97b330f0dbfe15e486411c8 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
git-am [options] --resolved
git-am [options] --skip
--
-d,dotest= use <dir> and not .dotest
+d,dotest= (removed -- do not use)
i,interactive run interactively
b,binary pass --allo-binary-replacement to git-apply
3,3way allow fall back on 3way merging if needed
then
cmdline="$cmdline -3"
fi
- if test '.dotest' != "$dotest"
- then
- cmdline="$cmdline -d=$dotest"
- fi
echo "When you have resolved this problem run \"$cmdline --resolved\"."
echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
}
prec=4
-dotest="${prefix}.dotest"
+dotest=".dotest"
sign= utf8=t keep= skip= interactive= resolved= binary=
resolvemsg= resume=
git_apply_opt=
--skip)
skip=t ;;
-d|--dotest)
- shift
- case "$1" in /*) dotest=$1;; *) dotest="$prefix$1" ;; esac ;;
+ die "-d option is no longer supported. Do not use."
+ ;;
--resolvemsg)
shift; resolvemsg=$1 ;;
--whitespace)
0,)
# No file input but without resume parameters; catch
# user error to feed us a patch from standard input
- # when there is already .dotest. This is somewhat
+ # when there is already $dotest. This is somewhat
# unreliable -- stdin could be /dev/null for example
# and the caller did not intend to feed us a patch but
# wanted to continue unattended.