projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* ak/apply-non-git-epoch:
  apply: handle patches with funny filename and colon in timezone
  apply: Recognize epoch timestamps with : in the timezone

1  2 
builtin/apply.c patch | diff1 | diff2 | blob | history

diff --cc builtin/apply.c
Simple merge
Git—the stupid content tracker