![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 13 Mar 2008 06:47:31 +0000 (23:47 -0700) | ||
| committer | Junio 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
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