</p>\r
</dd>\r
<dt>\r
+<a id="ref_master"></a>master\r
+</dt>\r
+<dd>\r
+<p>\r
+ The default <a href="#ref_branch">branch</a>. Whenever you create a git\r
+ <a href="#ref_repository">repository</a>, a <a href="#ref_branch">branch</a> named\r
+ "<a href="#ref_master">master</a>" is created, and becomes the active\r
+ <a href="#ref_branch">branch</a>. In most cases, this contains the local\r
+ development.\r
+</p>\r
+</dd>\r
+<dt>\r
<a id="ref_merge"></a>merge\r
</dt>\r
<dd>\r
</p>\r
</dd>\r
<dt>\r
+<a id="ref_origin"></a>origin\r
+</dt>\r
+<dd>\r
+<p>\r
+ The default upstream <a href="#ref_branch">branch</a>. Most projects have one\r
+ upstream project which they track, and by default\r
+ <em><a href="#ref_origin">origin</a></em> is used for that purpose. New updates from\r
+ upstream will be fetched into this <a href="#ref_branch">branch</a>; you should\r
+ never <a href="#ref_commit">commit</a> to it yourself.\r
+</p>\r
+</dd>\r
+<dt>\r
<a id="ref_pack"></a>pack\r
</dt>\r
<dd>\r
<dd>\r
<p>\r
To <a href="#ref_clean">clean</a> a <a href="#ref_branch">branch</a> by starting from the\r
- <a href="#ref_head">head</a> of the main line of development ("master"), and\r
- reapply the (possibly cherry-picked) changes from that\r
- <a href="#ref_branch">branch</a>.\r
+ <a href="#ref_head">head</a> of the main line of development\r
+ ("<a href="#ref_master">master</a>"), and reapply the (possibly cherry-picked)\r
+ changes from that <a href="#ref_branch">branch</a>.\r
</p>\r
</dd>\r
<dt>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 06-Jan-2006 17:13:01 PDT\r
+Last updated 10-Jan-2006 16:53:50 PDT\r
</div>\r
</div>\r
</body>\r