@matheusbsbs / matheus-bagliano / commits / d5a6aafc90
Fork 0

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 <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>

Johannes Schindelin committed Jan 10, 2006 at 22:26 UTC d5a6aafc90a14382120727e4e81ee1a380e8b194
1 file changed +11
Documentation/glossary.txt
+11
@@ -111,6 +111,17 @@ branch::
111 a particular revision, which is called the branch head. The
112 branch heads are stored in `$GIT_DIR/refs/heads/`.
113
114 +master::
115 + The default branch. Whenever you create a git repository, a branch
116 + named "master" is created, and becomes the active branch. In most
117 + cases, this contains the local development.
118 +
119 +origin::
120 + The default upstream branch. Most projects have one upstream
121 + project which they track, and by default 'origin' is used for
122 + that purpose. New updates from upstream will be fetched into
123 + this branch; you should never commit to it yourself.
124 +
125 ref::
126 A 40-byte hex representation of a SHA1 pointing to a particular
127 object. These may be stored in `$GIT_DIR/refs/`.