Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Jan 2015 22:01:18 +0000 (14:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Jan 2015 22:01:18 +0000 (14:01 -0800)
commit9ea21fa89c3b0762189d2d6e4689b8e09940aad4
tree3dbfb8daa87c48aa679822205eb11638749e832f
parentba1edc92646ec0adf392542ad94fcafe5636f7c2
parentd37239536ce960af9292fdf297e7c277303e95be
Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maint

* jk/approxidate-avoid-y-d-m-over-future-dates:
  approxidate: allow ISO-like dates far in the future
  pass TIME_DATE_NOW to approxidate future-check
date.c