From cb3a160d604866331fdb0f5078face4ab2a4b49a Mon Sep 17 00:00:00 2001 From: Stephan Beyer Date: Sat, 9 Aug 2008 01:28:54 +0200 Subject: [PATCH] git-am: ignore --binary option The git-apply documentation says that --binary is a historical option. This patch lets git-am ignore --binary and removes advertisements of this option. Signed-off-by: Stephan Beyer Signed-off-by: Junio C Hamano --- Documentation/git-am.txt | 7 +------ git-am.sh | 19 +++++++------------ t/t0023-crlf-am.sh | 2 +- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index c45c53ec2..b9c6fac74 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git am' [--signoff] [--keep] [--utf8 | --no-utf8] - [--3way] [--interactive] [--binary] + [--3way] [--interactive] [--whitespace=