diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-05 21:00:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-05 21:00:33 -0700 |
| commit | 39a5d50d62780e2f838e5fa8196c06fba2baa956 (patch) | |
| tree | 400746e314a752dde0cabc4021a3f27064d33acc /Documentation/merge-strategies.txt | |
| parent | Merge branch 'nd/t1509-chroot-test' (diff) | |
| parent | parse_date_basic(): let the system handle DST conversion (diff) | |
| download | tgif-39a5d50d62780e2f838e5fa8196c06fba2baa956.tar.xz | |
Merge branch 'jc/epochtime-wo-tz'
"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
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions