Skip to content

Commit

Permalink
Documentation: update glossary entry for "origin"
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
J. Bruce Fields authored and Junio C Hamano committed Jan 1, 2007
1 parent 36566cc commit f65bb2c
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Documentation/glossary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f65bb2c

Please sign in to comment.