From: "Steven E. Harris" <seh@panix.com>
To: git@vger.kernel.org
Subject: Understanding git.git's branch policy
Date: Sun, 24 Jan 2010 18:34:11 -0500 [thread overview]
Message-ID: <83pr4znklo.fsf@torus.sehlabs.com> (raw)
Radding the maintain-git.txt document¹, there are a few points that I'm
having trouble decoding. Under "The Policy", it notes
,----
| The tips of 'master', 'maint' and 'next' branches will always
| fast-forward, to allow people to build their own customization on top
| of them.
`----
I understand that a "fast-forward merge" means that one's current HEAD
commit is an ancestor of the evolved branch's head, so that the HEAD
pointer can move forward to "catch up" without needing to combine
disparate content.
How does this relate to the prescribed use of the "master", "maint", and
"next" branches? What operations or patterns does it constrain against?
Footnotes:
¹ http://kernel.org/pub/software/scm/git/docs/howto/maintain-git.txt
--
Steven E. Harris
next reply other threads:[~2010-01-24 23:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-24 23:34 Steven E. Harris [this message]
2010-01-25 0:17 ` Understanding git.git's branch policy Petr Baudis
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=83pr4znklo.fsf@torus.sehlabs.com \
--to=seh@panix.com \
--cc=git@vger.kernel.org \
/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).