![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 13 Mar 2010 20:02:54 +0000 (12:02 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 13 Mar 2010 20:02:54 +0000 (12:02 -0800) | ||
| commit | 19a64770435c72721dece82c52468f70745e9a95 | |
| tree | 3f2665d896c89041c2d7af739b7607d9c30747f7 | tree | snapshot |
| parent | 809780b662355a9ded05b450a07bbe79d0d2e26e | commit | diff |
| parent | 95109f29475a0ffc5ed4d2be1e95b01062ad1e94 | commit | diff |
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
* git://git.bogomips.org/git-svn:
t9150,t9151: Add rewrite-root option to init
git-svn: Fix merge detecting with rewrite-root