projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ae0a37c 2d502e1)
Merge branch 'ak/apply-non-git-epoch' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 9 Dec 2010 18:36:16 +0000 (10:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Dec 2010 18:36:16 +0000 (10:36 -0800)
commitded4dfd5196a007a6e56da1821a3a00292242a53
tree140e20d74c0692ffc9af92bbe7ebf989394d5e44tree | snapshot
parentae0a37cd6bc05b5ab511d0d1a541dc57d52753e6commit | diff
parent2d502e1f378a39ef375d6d5c1b3312d286ed2524commit | diff
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
builtin/apply.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.