path: root/Documentation/glossary.txt
diff options
authorJohannes Schindelin <>2006-01-10 21:26:46 (GMT)
committerJunio C Hamano <>2006-01-11 00:02:54 (GMT)
commitd5a6aafc90a14382120727e4e81ee1a380e8b194 (patch)
tree54c14debeeaeab01d241fd49bf854f603b7d6b18 /Documentation/glossary.txt
parent6f2eacfeb2c67a7e05f98df2288d7893d3368c8e (diff)
glossary: explain "master" and "origin"
If you are a long time git user/developer, you forget that to a new git user, these words have not the same meaning as to you. [jc: with updates from J. Bruce Fields.] Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
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/`.