summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-22 20:27:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-12-22 20:27:55 (GMT)
commitd539eb9d25fdb9a7d820596eb11b04960d8d09ee (patch)
tree2be83c9421dfb7b1abe25e6e1f560d550cc63793 /Documentation
parent6d43519a8ee8dd2d9b695733c819101dcc713683 (diff)
parent0cef4e765c10118f6e33dd770a475b9cd89a7960 (diff)
downloadgit-d539eb9d25fdb9a7d820596eb11b04960d8d09ee.zip
git-d539eb9d25fdb9a7d820596eb11b04960d8d09ee.tar.gz
git-d539eb9d25fdb9a7d820596eb11b04960d8d09ee.tar.bz2
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
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-am.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index cfb74bc..f4eea28 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>::