From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 13 Mar 2010 20:02:54 +0000 (-0800)
Subject: Merge git://git.bogomips.org/git-svn
X-Git-Tag: v1.7.1-rc0~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19a64770435c72721dece82c52468f70745e9a95;p=thirdparty%2Fgit.git

Merge git://git.bogomips.org/git-svn

* git://git.bogomips.org/git-svn:
  t9150,t9151: Add rewrite-root option to init
  git-svn: Fix merge detecting with rewrite-root
---

19a64770435c72721dece82c52468f70745e9a95