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

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jan 10, 2006, 21:40 UTC
Message-ID: <Pine.LNX.4.63.0601102238570.802@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <20060110213645.GF13450@fieldses.org>

Hi,

On Tue, 10 Jan 2006, J. Bruce Fields wrote:

Show 16 quoted lines

> On Tue, Jan 10, 2006 at 10:26:46PM +0100, Johannes Schindelin wrote:
> > +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."

It is probably safer. Note: I actually commit to the origin branch in one of my projects, and I follow it directly by a "git push origin".

Ciao, Dscho

P.S.: I just noted that some of the tabs were turned into spaces. Does asciidoc mind?