summaryrefslogtreecommitdiff
path: root/t/t6033-merge-crlf.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-01-07 13:01:16 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-01-07 13:01:16 -0800
commit04950c714107345c92c5287bcef8f1eab7318391 (patch)
tree84326599356881bc3bc389c5f8443ff0ac897e03 /t/t6033-merge-crlf.sh
parentMerge branch 'br/imap-send-via-libcurl' (diff)
parentapproxidate: allow ISO-like dates far in the future (diff)
downloadtgif-04950c714107345c92c5287bcef8f1eab7318391.tar.xz
Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates'
Traditionally we tried to avoid interpreting date strings given by the user as future dates, e.g. GIT_COMMITTER_DATE=2014-12-10 when used early November 2014 was taken as "October 12, 2014" because it is likely that a date in the future, December 10, is a mistake. Loosen this and do not tiebreak by future-ness of the date when (1) ISO-like format is used, and (2) the string can make sense interpreted as both y-m-d and y-d-m. * 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
Diffstat (limited to 't/t6033-merge-crlf.sh')
0 files changed, 0 insertions, 0 deletions