Re: [PATCH] glossary: explain "master" and "origin"

From: J. Bruce Fields <bfields@fieldses.org>
Date: Jan 10, 2006, 21:36 UTC
Message-ID: <20060110213645.GF13450@fieldses.org>
In-Reply-To: <Pine.LNX.4.63.0601102226130.649@wbgn013.biozentrum.uni-wuerzburg.de>

On Tue, Jan 10, 2006 at 10:26:46PM +0100, Johannes Schindelin wrote:

Show 5 quoted lines

> +origin::
> +	The default upstream branch. Most projects have one upstream 
> +        project which is tracked, and augmented with local changes which
> +        eventually get merged back. You never commit to this branch,
> +	unless you are maintaining the upstream project.

The last line is somewhat confusing--a naive reader might take it to mean that as an upstream maintainer it would make sense to commit to a branch named "origin". How about something like this?

	"The default upstream branch.  Most projects have one upstream
	project which they track.  This is is the branch used for
	tracking that project.  New updates from upstream will be
	fetched into this branch, but you should never commit to it
	yourself."

--b.