diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-02-10 14:08:12 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-02-10 14:08:12 -0800 |
commit | 3d8bc74127bbb583bc437214a1d6c9afcf77646c (patch) | |
tree | 6d1788c66ea9e038252cf6641b5c580c641dcb88 /mergetools | |
parent | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' (diff) | |
parent | parse_date(): '@' prefix forces git-timestamp (diff) | |
download | tgif-3d8bc74127bbb583bc437214a1d6c9afcf77646c.tar.xz |
Merge branch 'jc/parse-date-raw'
* jc/parse-date-raw:
parse_date(): '@' prefix forces git-timestamp
parse_date(): allow ancient git-timestamp
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions