diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-01-10 16:29:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-10 16:29:17 -0800 |
| commit | cfa6d70bd4a24fd9915880112cf1af41a616579c (patch) | |
| tree | b45c0333802284fe87a77c5d2baaa2bd7a6b047b | |
| parent | show-branch: take default arguments from configuration file. (diff) | |
| parent | GIT 1.1.1 (diff) | |
| download | tgif-cfa6d70bd4a24fd9915880112cf1af41a616579c.tar.xz | |
Merge fixes up to GIT 1.1.1
| -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/`. |