projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4096958 dff589e)
Merge git://git.bogomips.org/git-svn
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Oct 2009 23:07:41 +0000 (16:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Oct 2009 23:07:41 +0000 (16:07 -0700)
commit3c1ca015281e90541a7baf092448556ec6c588a0
tree605dbfa2b00bf4dc06787c5872a09d84b8cfb7e2tree | snapshot
parent4096958aab6f83302dd00f19d2bd500ae75e8c29commit | diff
parentdff589ef949e97cbec5363b105ba27f6e85594fbcommit | diff
Merge git://git.bogomips.org/git-svn

* git://git.bogomips.org/git-svn:
  git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents
  git-svn: add test data for SVN 1.5+ merge, with script.
  git-svn: convert SVK merge tickets to extra parents
  git-svn: allow test setup script to support PERL env. var
  git-svn: add test data for SVK merge, with script.
  git svn: fix fetch where glob is on the top-level URL
Git—the stupid content tracker