path: root/Documentation/glossary.txt
diff options
Diffstat (limited to 'Documentation/glossary.txt')
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/`.
+ 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.
+ 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.
A 40-byte hex representation of a SHA1 pointing to a particular
object. These may be stored in `$GIT_DIR/refs/`.