<?xml version="1.0"?>
<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
	<id>https://badge.emfcamp.org/w/index.php?action=history&amp;feed=atom&amp;title=TiLDA_MK3%2Fsubtree</id>
	<title>TiLDA MK3/subtree - Revision history</title>
	<link rel="self" type="application/atom+xml" href="https://badge.emfcamp.org/w/index.php?action=history&amp;feed=atom&amp;title=TiLDA_MK3%2Fsubtree"/>
	<link rel="alternate" type="text/html" href="https://badge.emfcamp.org/w/index.php?title=TiLDA_MK3/subtree&amp;action=history"/>
	<updated>2026-04-29T14:51:51Z</updated>
	<subtitle>Revision history for this page on the wiki</subtitle>
	<generator>MediaWiki 1.39.6</generator>
	<entry>
		<id>https://badge.emfcamp.org/w/index.php?title=TiLDA_MK3/subtree&amp;diff=41&amp;oldid=prev</id>
		<title>Marekventur: Created page with &quot;= UGFX subtree management = The folder UGFX is a subtree tracking git@bitbucket.org:mattbrejza/ugfx.git. Please don't edit anything in there directly unless you know what you'...&quot;</title>
		<link rel="alternate" type="text/html" href="https://badge.emfcamp.org/w/index.php?title=TiLDA_MK3/subtree&amp;diff=41&amp;oldid=prev"/>
		<updated>2016-07-07T17:33:19Z</updated>

		<summary type="html">&lt;p&gt;Created page with &amp;quot;= UGFX subtree management = The folder UGFX is a subtree tracking git@bitbucket.org:mattbrejza/ugfx.git. Please don&amp;#039;t edit anything in there directly unless you know what you&amp;#039;...&amp;quot;&lt;/p&gt;
&lt;p&gt;&lt;b&gt;New page&lt;/b&gt;&lt;/p&gt;&lt;div&gt;= UGFX subtree management =&lt;br /&gt;
The folder UGFX is a subtree tracking git@bitbucket.org:mattbrejza/ugfx.git. Please don't edit anything in there directly unless you know what you're doing.&lt;br /&gt;
&lt;br /&gt;
Read https://medium.com/@porteneuve/mastering-git-subtrees-943d29a798ec for more information on the topic.&lt;br /&gt;
&lt;br /&gt;
== Prerequisites==&lt;br /&gt;
&amp;lt;pre&amp;gt;&lt;br /&gt;
git remote add ugfx git@bitbucket.org:mattbrejza/ugfx.git&lt;br /&gt;
&amp;lt;/pre&amp;gt;&lt;br /&gt;
&lt;br /&gt;
== How it's set up==&lt;br /&gt;
&amp;lt;pre&amp;gt;&lt;br /&gt;
git read-tree --prefix=extmod/ugfx -u ugfx/master&lt;br /&gt;
git commit -m &amp;quot;...&amp;quot;&lt;br /&gt;
&amp;lt;/pre&amp;gt;&lt;br /&gt;
&lt;br /&gt;
== How to update the subtree==&lt;br /&gt;
&amp;lt;pre&amp;gt;&lt;br /&gt;
git fetch ugfx&lt;br /&gt;
git merge -s subtree --squash ugfx/master&lt;br /&gt;
git commit -m &amp;quot;Update UGFX subtree to ...&amp;quot;&lt;br /&gt;
&amp;lt;/pre&amp;gt;&lt;/div&gt;</summary>
		<author><name>Marekventur</name></author>
	</entry>
</feed>