Skip to content
Snippets Groups Projects
Commit 4eeb1de1 authored by Thomas Rast's avatar Thomas Rast Committed by Junio C Hamano
Browse files

git-am: error out when seeing -b/--binary


The --binary option to git-apply has been a no-op since 2b6eef94 (Make
apply --binary a no-op., 2006-09-06) and was deprecated in cb3a160d
(git-am: ignore --binary option, 2008-08-09).

We could remove it outright, but let's be nice to people who still
have scripts saying 'git am -b' (if they exist) and tell them the
reason for the sudden failure.

Signed-off-by: default avatarThomas Rast <trast@student.ethz.ch>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent b8de3f4b
Branches
Tags
No related merge requests found
......@@ -380,7 +380,9 @@ 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."
;;
-3|--3way)
threeway=t ;;
-s|--signoff)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment