diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-01-10 22:26:46 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-10 16:02:54 -0800 |
| commit | d5a6aafc90a14382120727e4e81ee1a380e8b194 (patch) | |
| tree | 54c14debeeaeab01d241fd49bf854f603b7d6b18 /Documentation | |
| parent | 6f2eacfeb2c67a7e05f98df2288d7893d3368c8e (diff) | |
| download | git-d5a6aafc90a14382120727e4e81ee1a380e8b194.tar.gz git-d5a6aafc90a14382120727e4e81ee1a380e8b194.tar.xz | |
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/glossary.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt index 2331be5a7..02a9d9c18 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/`. |