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

* 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 9adce372ec6e6ec0d371c411da1e5002baea5f51..d4ef16c16a6c25a302110029c8f68a3059c17c27 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -83,7 +83,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>::