X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fglossary.txt;h=02a9d9c18acaf1e6091049aaf6d2fd1f2490e573;hb=fe77bb1a02d5b8dd3915cd27a83b660debaecda4;hp=520f4c50fc129e1b1e3ad56a6219440590d4c6ed;hpb=a9572072f0ab0ac97e64b0dc01254a3ad95befe1;p=git.git

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 520f4c50..02a9d9c1 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -19,7 +19,7 @@ hash::
 	In git's context, synonym to object name.
 
 object database::
-	Stores a set of "objects", and an individial object is identified
+	Stores a set of "objects", and an individual object is identified
 	by its object name. The objects usually live in `$GIT_DIR/objects/`.
 
 blob object::
@@ -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/`.