summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-11 00:19:11 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-11 00:19:11 (GMT)
commit78ff5cf6b5595fa3ae291fa9ee3595b7c7cc624a (patch)
tree834b1004515b01385aea48c11c2e52950423739f /Documentation
parenteb858c60d7850fc2ed2f69397f0560e707de324d (diff)
parentd5a6aafc90a14382120727e4e81ee1a380e8b194 (diff)
downloadgit-78ff5cf6b5595fa3ae291fa9ee3595b7c7cc624a.zip
git-78ff5cf6b5595fa3ae291fa9ee3595b7c7cc624a.tar.gz
git-78ff5cf6b5595fa3ae291fa9ee3595b7c7cc624a.tar.bz2
GIT 1.1.1v1.1.1
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/glossary.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 2331be5..02a9d9c 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/`.