man: git pull -r is a short for --rebase

diff --git a/git-am.sh b/git-am.sh
index 0bd290b4ae990df4e0553700fa4fa38696e2b980..4da0ddafc4bf2029823148e7285085661c134497 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -380,7 +380,9 @@ do
        -i|--interactive)
                interactive=t ;;
        -b|--binary)
-               : ;;
+               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 ;;
        -s|--signoff)