From cb3a160d604866331fdb0f5078face4ab2a4b49a Mon Sep 17 00:00:00 2001
From: Stephan Beyer <s-beyer@gmx.net>
Date: Sat, 9 Aug 2008 01:28:54 +0200
Subject: 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 <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Documentation/git-am.txt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'Documentation/git-am.txt')

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index c45c53ec24..b9c6fac748 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=<option>] [-C<n>] [-p<n>]
 	 [<mbox> | <Maildir>...]
 'git am' (--skip | --resolved | --abort)
@@ -59,11 +59,6 @@ default.   You could use `--no-utf8` to override this.
 	it is supposed to apply to, and we have those blobs
 	available locally.
 
--b::
---binary::
-	Pass `--allow-binary-replacement` flag to 'git-apply'
-	(see linkgit:git-apply[1]).
-
 --whitespace=<option>::
 	This flag is passed to the 'git-apply' (see linkgit:git-apply[1])
 	program that applies
-- 
cgit v1.2.3