diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2006-12-31 18:47:36 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-31 16:37:20 -0800 |
| commit | f65bb2c66fbebc10810857c64466679c81bf8154 (patch) | |
| tree | bdbb5779184820860b4953d7d8924d395fb39cef | |
| parent | 36566cc0bc2e5e930e4ed885e1a15fcfd10b0b53 (diff) | |
| download | git-f65bb2c66fbebc10810857c64466679c81bf8154.tar.gz git-f65bb2c66fbebc10810857c64466679c81bf8154.tar.xz | |
Documentation: update glossary entry for "origin"
Update glossary entry for "origin" to reflect fact that it normally now refers
to a remote repository, not a branch.
Also, warning not to work on remote-tracking branches is no longer necessary
since git doesn't allow that.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/glossary.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt index 894883d7b..7c1a6592c 100644 --- a/Documentation/glossary.txt +++ b/Documentation/glossary.txt @@ -188,11 +188,12 @@ octopus:: predator. origin:: - The default upstream tracking branch. Most projects have at + The default upstream repository. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates - will be fetched into this branch; you should never commit - to it yourself. + will be fetched into remote tracking branches named + origin/name-of-upstream-branch, which you can see using + "git branch -r". pack:: A set of objects which have been compressed into one file (to save |