X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fglossary.txt;h=02a9d9c18acaf1e6091049aaf6d2fd1f2490e573;hb=abb7c7b31c0896bd838bbb6437b310db5a42227a;hp=2331be5a71626d03d3f8f1720107418dc5174bc3;hpb=92e802c6ccb96d1b5e8561b0a136d43d82253293;p=git.git

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/`.