X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-am.sh;h=4da0ddafc4bf2029823148e7285085661c134497;hb=fdec2eb8ebbf995a77e2ab9971565c792b52944a;hp=faae82071985e756af18f2f5644b8a4a2bb3bd03;hpb=3101a748dc23a9214db68cc2d0fc81064d54b9ea;p=git.git diff --git a/git-am.sh b/git-am.sh index faae82071..4da0ddafc 100755 --- a/git-am.sh +++ b/git-am.sh @@ -380,8 +380,8 @@ do -i|--interactive) interactive=t ;; -b|--binary) - echo >&2 "The -b/--binary option was deprecated in 1.6.0 and removed in 1.7.10." - die "Please adjust your scripts." + echo >&2 "The $1 option has been a no-op for long time, and" + echo >&2 "it will be removed. Please do not use it anymore." ;; -3|--3way) threeway=t ;;