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
git-mirror · Jan 12, 2015 · ba1edc9 · ba1edc9
2 parents 417a5b2 + 0cef4e7
commit ba1edc9
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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>::