From: "J. Bruce Fields" <bfields@fieldses.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org, junkio@cox.net
Subject: Re: [PATCH] glossary: explain "master" and "origin"
Date: Tue, 10 Jan 2006 16:36:45 -0500 [thread overview]
Message-ID: <20060110213645.GF13450@fieldses.org> (raw)
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:
> +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.
next prev parent reply other threads:[~2006-01-10 21:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-10 21:26 [PATCH] glossary: explain "master" and "origin" Johannes Schindelin
2006-01-10 21:36 ` J. Bruce Fields [this message]
2006-01-10 21:40 ` Johannes Schindelin
2006-01-11 6:12 ` Junio C Hamano
2006-01-10 22:27 ` walt
2006-01-10 23:33 ` walt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060110213645.GF13450@fieldses.org \
--to=bfields@fieldses.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).