]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/epochtime-wo-tz' into maint-2.3
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:33:58 +0000 (14:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:33:58 +0000 (14:33 -0700)
"git commit --date=now" or anything that relies on approxidate lost
the daylight-saving-time offset.

* jc/epochtime-wo-tz:
  parse_date_basic(): let the system handle DST conversion
  parse_date_basic(): return early when given a bogus timestamp

1  2 
date.c

diff --cc date.c
Simple merge