diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-10 16:20:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-10 16:20:22 -0800 |
| commit | 0de62e598552765eb674b72bbaf55b2e2933f617 (patch) | |
| tree | 4814721dbd58991456c4a6815ab7a1d9dfe2dab4 | |
| parent | GIT 1.0.8 (diff) | |
| parent | glossary: explain "master" and "origin" (diff) | |
| download | git-1.0.9.tar.gz git-1.0.9.zip | |
GIT 1.0.9v1.0.9
| -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 2331be5a71..02a9d9c18a 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/`. |