Andrew's git / gitweb.git / diff
?
Merge branch 'rw/apply-does-not-take-ignore-date'
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:27:51 +0000 (12:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:27:55 +0000 (12:27 -0800)
* rw/apply-does-not-take-ignore-date:
git-am.txt: --ignore-date flag is not passed to git-apply

Documentation/git-am.txt patch | blob | history
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>::