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)
* 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

1  2 
date.c

diff --cc date.c
Simple merge