From: bfields@fieldses.org Date: Sun, 31 Dec 2006 23:47:36 GMT Subject: [PATCH] Documentation: update glossary entry for "origin" Message-ID: <11676088581948-git-send-email-bfields@fieldses.org> In-Reply-To: <11676088582634-git-send-email-bfields@fieldses.org> From: J. Bruce Fields 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 --- Documentation/glossary.txt | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt index 894883d..7c1a659 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 -- 1.5.0.rc0.gac28