<?xml version="1.0" encoding="utf-8"?><!-- generator="wordpress/2.0.11" -->
<rss version="2.0" 
	xmlns:content="http://purl.org/rss/1.0/modules/content/">
<channel>
	<title>Comments on: When the Levee Breaks</title>
	<link>http://log.emmanuelebassi.net/archives/2007/09/when-the-levee-breaks/</link>
	<description>Random babblings of a geek.</description>
	<pubDate>Sun, 12 Oct 2008 16:48:00 +0000</pubDate>
	<generator>http://wordpress.org/?v=2.0.11</generator>

	<item>
		<title>by: Emmanuele Bassi</title>
		<link>http://log.emmanuelebassi.net/archives/2007/09/when-the-levee-breaks/#comment-216980</link>
		<pubDate>Wed, 02 Jan 2008 23:43:52 +0000</pubDate>
		<guid>http://log.emmanuelebassi.net/archives/2007/09/when-the-levee-breaks/#comment-216980</guid>
					<description>@dave: thanks, fixed it :-)</description>
		<content:encoded><![CDATA[<p>@dave: thanks, fixed it <img src='http://log.emmanuelebassi.net/wp-includes/images/smilies/icon_smile.gif' alt=':-)' class='wp-smiley' />
</p>
]]></content:encoded>
				</item>
	<item>
		<title>by: dave tweed</title>
		<link>http://log.emmanuelebassi.net/archives/2007/09/when-the-levee-breaks/#comment-203740</link>
		<pubDate>Mon, 17 Dec 2007 22:02:24 +0000</pubDate>
		<guid>http://log.emmanuelebassi.net/archives/2007/09/when-the-levee-breaks/#comment-203740</guid>
					<description>Just to let you know: the link points to a script with a type on the last-but-2 line: it says "&#38;&#38; it-prune" rather than "&#38;&#38; git prune". Other than that, thanks for a useful script automating all the fiddly bits of extracting history :-)</description>
		<content:encoded><![CDATA[<p>Just to let you know: the link points to a script with a type on the last-but-2 line: it says &#8220;&amp;&amp; it-prune&#8221; rather than &#8220;&amp;&amp; git prune&#8221;. Other than that, thanks for a useful script automating all the fiddly bits of extracting history <img src='http://log.emmanuelebassi.net/wp-includes/images/smilies/icon_smile.gif' alt=':-)' class='wp-smiley' />
</p>
]]></content:encoded>
				</item>
	<item>
		<title>by: pardus</title>
		<link>http://log.emmanuelebassi.net/archives/2007/09/when-the-levee-breaks/#comment-131174</link>
		<pubDate>Tue, 25 Sep 2007 11:35:15 +0000</pubDate>
		<guid>http://log.emmanuelebassi.net/archives/2007/09/when-the-levee-breaks/#comment-131174</guid>
					<description>Bindings for the upstream gtksourceview2 would be brilliant. If only because this release of the sourceview engine actually does a decent job at highlighting perl code.</description>
		<content:encoded><![CDATA[<p>Bindings for the upstream gtksourceview2 would be brilliant. If only because this release of the sourceview engine actually does a decent job at highlighting perl code.
</p>
]]></content:encoded>
				</item>
	<item>
		<title>by: Tobu</title>
		<link>http://log.emmanuelebassi.net/archives/2007/09/when-the-levee-breaks/#comment-119557</link>
		<pubDate>Tue, 11 Sep 2007 14:29:53 +0000</pubDate>
		<guid>http://log.emmanuelebassi.net/archives/2007/09/when-the-levee-breaks/#comment-119557</guid>
					<description>I've wondered about reversing the split, and apparently &lt;a href="http://www.kernel.org/pub/software/scm/git/docs/git-filter-branch.html" rel="nofollow"&gt;git filter-branch&lt;/a&gt; does it too.

This to move a subproject into a subdir:
&lt;code&gt;
git filter-branch --index-filter \
        'git ls-files -s &#124; sed "s-\t-&#38;newsubdir/-" &#124;
                GIT_INDEX_FILE=$GIT_INDEX_FILE.new \
                        git update-index --index-info &#38;&#38;
         mv $GIT_INDEX_FILE.new $GIT_INDEX_FILE' HEAD
&lt;/code&gt;

Some git pulls to import the subproject histories into a new repo.

And some grafting:
&lt;code&gt;
echo "$commit-id $graft-id" &#62;&#62; .git/info/grafts
git filter-branch $graft-id..HEAD
&lt;/code&gt;

That's untested though.</description>
		<content:encoded><![CDATA[<p>I&#8217;ve wondered about reversing the split, and apparently <a href="http://www.kernel.org/pub/software/scm/git/docs/git-filter-branch.html" rel="nofollow">git filter-branch</a> does it too.</p>
<p>This to move a subproject into a subdir:<br />
<code><br />
git filter-branch --index-filter \<br />
        'git ls-files -s | sed "s-\t-&amp;newsubdir/-" |<br />
                GIT_INDEX_FILE=$GIT_INDEX_FILE.new \<br />
                        git update-index --index-info &amp;&amp;<br />
         mv $GIT_INDEX_FILE.new $GIT_INDEX_FILE' HEAD<br />
</code></p>
<p>Some git pulls to import the subproject histories into a new repo.</p>
<p>And some grafting:<br />
<code><br />
echo "$commit-id $graft-id" &gt;&gt; .git/info/grafts<br />
git filter-branch $graft-id..HEAD<br />
</code></p>
<p>That&#8217;s untested though.
</p>
]]></content:encoded>
				</item>
	<item>
		<title>by: Alexander Larsson</title>
		<link>http://log.emmanuelebassi.net/archives/2007/09/when-the-levee-breaks/#comment-119556</link>
		<pubDate>Tue, 11 Sep 2007 14:24:35 +0000</pubDate>
		<guid>http://log.emmanuelebassi.net/archives/2007/09/when-the-levee-breaks/#comment-119556</guid>
					<description>git-filter-branch rules. I used it a lot when splitting out gio from gvfs, and will use it to merge gio into subversion.</description>
		<content:encoded><![CDATA[<p>git-filter-branch rules. I used it a lot when splitting out gio from gvfs, and will use it to merge gio into subversion.
</p>
]]></content:encoded>
				</item>
</channel>
</rss>
