From d5a6aafc90a14382120727e4e81ee1a380e8b194 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 10 Jan 2006 22:26:46 +0100 Subject: [PATCH] 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 --- Documentation/glossary.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) 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/`. -- 2.11.0