| commit | ded4dfd5196a007a6e56da1821a3a00292242a53 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 9 Dec 2010 18:36:16 +0000 (9 10:36 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 9 Dec 2010 18:36:16 +0000 (9 10:36 -0800) | ||
| tree | 140e20d74c0692ffc9af92bbe7ebf989394d5e44 | treesnapshot (tar.gz zip) |
| parent | ae0a37cd6bc05b5ab511d0d1a541dc57d52753e6 | commitdiff |
| parent | 2d502e1f378a39ef375d6d5c1b3312d286ed2524 | commitdiff |
Merge branch 'ak/apply-non-git-epoch' into maint
* 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 | blobhistory |