Autogenerated HTML docs for v1.1.1-gcfa6

diff --git a/glossary.html b/glossary.html
index 13952f5646cf8953c1f819b94c694fc616a4e63b..00f2633a1f86e0ec6318a57941d40459b767aa5e 100644 (file)
--- a/glossary.html
+++ b/glossary.html
@@ -503,6 +503,18 @@ div.exampleblock-content {
 </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
@@ -564,6 +576,18 @@ div.exampleblock-content {
 </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
@@ -653,9 +677,9 @@ div.exampleblock-content {
 <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
@@ -800,7 +824,7 @@ the git-list &lt;git@vger.kernel.org&gt;.</p>
 </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

diff --git a/glossary.txt b/glossary.txt
index 2331be5a71626d03d3f8f1720107418dc5174bc3..02a9d9c18acaf1e6091049aaf6d2fd1f2490e573 100644 (file)
--- a/glossary.txt
+++ b/glossary.txt
@@ -111,6 +111,17 @@ branch::
        a particular revision, which is called the branch head. The
        branch heads are stored in `$GIT_DIR/refs/heads/`.
 
+master::
+       The default branch. Whenever you create a git repository, a branch
+       named "master" is created, and becomes the active branch. In most
+       cases, this contains the local development.
+
+origin::
+       The default upstream branch. Most projects have one upstream
+       project which they track, and by default 'origin' is used for
+       that purpose.  New updates from upstream will be fetched into
+       this branch; you should never commit to it yourself.
+
 ref::
        A 40-byte hex representation of a SHA1 pointing to a particular
        object. These may be stored in `$GIT_DIR/refs/`.