![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Thomas Rast <trast@inf.ethz.ch> | |
| Mon, 12 Mar 2012 21:47:19 +0000 (22:47 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 12 Mar 2012 21:57:37 +0000 (14:57 -0700) | ||
| commit | 4eeb1de1c3855968bcd2d58b223fd187ae510d73 | |
| tree | 54d7452d6a46adfb304e805f20a12cf795d23966 | tree | snapshot |
| parent | b8de3f4b8c1e01ddbaf9a482e2bd2ef80da39d55 | commit | diff |
git-am: error out when seeing -b/--binary
The --binary option to git-apply has been a no-op since 2b6eef9 (Make
apply --binary a no-op., 2006-09-06) and was deprecated in cb3a160
(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: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The --binary option to git-apply has been a no-op since 2b6eef9 (Make
apply --binary a no-op., 2006-09-06) and was deprecated in cb3a160
(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: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-am.sh | diff | blob | history |