~vcs-imports/git/trunk

Viewing all changes in revision 11047.

  • Committer: Junio C Hamano
  • Author(s): Thomas Rast
  • Date: 2012-03-12 21:57:37 UTC
  • Revision ID: git-v1:4eeb1de1c3855968bcd2d58b223fd187ae510d73
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>

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: