Commit ba1edc92 authored by Junio C Hamano's avatar Junio C Hamano

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
parents 417a5b22 0cef4e76
......@@ -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>::
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment