projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25ee973 c36c5b8)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Mar 2008 06:47:31 +0000 (23:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Mar 2008 06:47:31 +0000 (23:47 -0700)
* maint:
  git-cvsimport: fix merging with remote parent branch
  gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form

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

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