X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=glossary.html;h=00f2633a1f86e0ec6318a57941d40459b767aa5e;hb=bfe9e75ebe8d3a83be46406130c76d54f8b14289;hp=13952f5646cf8953c1f819b94c694fc616a4e63b;hpb=235a91e6b0d1d18a2517cf7e0a18278a6912bdb0;p=git.git

diff --git a/glossary.html b/glossary.html
index 13952f56..00f2633a 100644
--- a/glossary.html
+++ b/glossary.html
@@ -503,6 +503,18 @@ div.exampleblock-content {
 </p>
 </dd>
 <dt>
+<a id="ref_master"></a>master
+</dt>
+<dd>
+<p>
+        The default <a href="#ref_branch">branch</a>. Whenever you create a git
+        <a href="#ref_repository">repository</a>, a <a href="#ref_branch">branch</a> named
+        "<a href="#ref_master">master</a>" is created, and becomes the active
+        <a href="#ref_branch">branch</a>. In most cases, this contains the local
+        development.
+</p>
+</dd>
+<dt>
 <a id="ref_merge"></a>merge
 </dt>
 <dd>
@@ -564,6 +576,18 @@ div.exampleblock-content {
 </p>
 </dd>
 <dt>
+<a id="ref_origin"></a>origin
+</dt>
+<dd>
+<p>
+        The default upstream <a href="#ref_branch">branch</a>. Most projects have one
+        upstream project which they track, and by default
+        <em><a href="#ref_origin">origin</a></em> is used for that purpose. New updates from
+        upstream will be fetched into this <a href="#ref_branch">branch</a>; you should
+        never <a href="#ref_commit">commit</a> to it yourself.
+</p>
+</dd>
+<dt>
 <a id="ref_pack"></a>pack
 </dt>
 <dd>
@@ -653,9 +677,9 @@ div.exampleblock-content {
 <dd>
 <p>
         To <a href="#ref_clean">clean</a> a <a href="#ref_branch">branch</a> by starting from the
-        <a href="#ref_head">head</a> of the main line of development ("master"), and
-        reapply the (possibly cherry-picked) changes from that
-        <a href="#ref_branch">branch</a>.
+        <a href="#ref_head">head</a> of the main line of development
+        ("<a href="#ref_master">master</a>"), and reapply the (possibly cherry-picked)
+        changes from that <a href="#ref_branch">branch</a>.
 </p>
 </dd>
 <dt>
@@ -800,7 +824,7 @@ the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 06-Jan-2006 17:13:01 PDT
+Last updated 10-Jan-2006 16:53:50 PDT
 </div>
 </div>
 </body>