![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Nov 2010 22:38:56 +0000 (14:38 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Nov 2010 22:38:56 +0000 (14:38 -0800) | ||
| commit | a00579c631726808f91e3b2c811cfba15157ec6c | |
| tree | 5edabce54f922d0d77408fdab8e81b1a7adcaae6 | tree | snapshot |
| parent | 6478f7f1b86d82f2fc0e9c113a2631524ba1293a | commit | diff |
| parent | 2d502e1f378a39ef375d6d5c1b3312d286ed2524 | commit | diff |
Merge branch 'ak/apply-non-git-epoch' into next
* 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 |