Merge branch 'nd/lockfile-absolute'

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index cfb74bcf0b3cbc3a3d972af65bff49cea2d9ca4d..f4eea28dc4d03e02f9af3eedba5d15743b8553f6 100644 (file)
--- 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>::