projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b7f39e b3bb5f7)
Merge branch 'maint-1.5.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 Apr 2008 05:55:07 +0000 (22:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Apr 2008 05:55:07 +0000 (22:55 -0700)
* maint-1.5.4:
  cvsimport: always pass user data to "system" as a list
  fix reflog approxidate parsing bug

1  2 
git-cvsimport.perl patch | diff1 | diff2 | blob | history
sha1_name.c patch | diff1 | diff2 | blob | history

diff --cc git-cvsimport.perl
Simple merge
diff --cc sha1_name.c
Simple merge
Git—the stupid content tracker