Andrew's git / gitweb.git / diff
?
Merge git://git.bogomips.org/git-svn
authorJunio C Hamano <gitster@pobox.com>
Sat, 13 Mar 2010 20:02:54 +0000 (12:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 13 Mar 2010 20:02:54 +0000 (12:02 -0800)
* git://git.bogomips.org/git-svn:
t9150,t9151: Add rewrite-root option to init
git-svn: Fix merge detecting with rewrite-root

Trivial merge