From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Dec 2014 20:27:51 +0000 (-0800)
Subject: Merge branch 'rw/apply-does-not-take-ignore-date'
X-Git-Tag: v2.3.0-rc0~47
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d539eb9d25fdb9a7d820596eb11b04960d8d09ee?hp=6d43519a8ee8dd2d9b695733c819101dcc713683

Merge branch 'rw/apply-does-not-take-ignore-date'

* rw/apply-does-not-take-ignore-date:
git-am.txt: --ignore-date flag is not passed to git-apply
---

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index cfb74bcf0b..f4eea28dc4 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -94,7 +94,6 @@ default.   You can use `--no-utf8` to override this.
 	it is supposed to apply to and we have those blobs
 	available locally.
 
---ignore-date::
 --ignore-space-change::
 --ignore-whitespace::
 --whitespace=<option>::