From: Junio C Hamano <junkio@cox.net>
Date: Wed, 11 Jan 2006 00:19:11 +0000 (-0800)
Subject: GIT 1.1.1
X-Git-Tag: v1.1.1^0
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=78ff5cf6b5595fa3ae291fa9ee3595b7c7cc624a;hp=eb858c60d7850fc2ed2f69397f0560e707de324d;p=git.git

GIT 1.1.1
---

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 2331be5a..02a9d9c1 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/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/`.