From: Junio C Hamano <junio@hera.kernel.org>
Date: Wed, 11 Jan 2006 00:54:55 +0000 (-0800)
Subject: Autogenerated HTML docs for v1.1.1-gcfa6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f3e80c05076d9a27bfb9e076ac91af18a64f1597;p=git.git

Autogenerated HTML docs for v1.1.1-gcfa6
---

diff --git a/glossary.html b/glossary.html
index 13952f564..00f2633a1 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>
diff --git a/glossary.txt b/glossary.txt
index 2331be5a7..02a9d9c18 100644
--- 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/`.