author | Junio C Hamano <gitster@pobox.com> | |
Tue, 30 Nov 2010 01:52:31 +0000 (17:52 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 30 Nov 2010 01:52:31 +0000 (17:52 -0800) | ||
commit | f565f6e06511249c8c3690277023a8550dbdfb47 | |
tree | b2e897cd8dc1539ad3f27d78282f55ff4efd2418 | tree | snapshot |
parent | feedaf43dbf31b18d96c4116e3b3f0c522b2cd7b | commit | diff |
parent | 2d502e1f378a39ef375d6d5c1b3312d286ed2524 | commit | diff |
Merge branch 'ak/apply-non-git-epoch'
* ak/apply-non-git-epoch:
apply: handle patches with funny filename and colon in timezone
apply: Recognize epoch timestamps with : in the timezone
* ak/apply-non-git-epoch:
apply: handle patches with funny filename and colon in timezone
apply: Recognize epoch timestamps with : in the timezone
builtin/apply.c | diff1 | | diff2 | | blob | history |