* Understanding git.git's branch policy
@ 2010-01-24 23:34 Steven E. Harris
2010-01-25 0:17 ` Petr Baudis
0 siblings, 1 reply; 2+ messages in thread
From: Steven E. Harris @ 2010-01-24 23:34 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Understanding git.git's branch policy
2010-01-24 23:34 Understanding git.git's branch policy Steven E. Harris
@ 2010-01-25 0:17 ` Petr Baudis
0 siblings, 0 replies; 2+ messages in thread
From: Petr Baudis @ 2010-01-25 0:17 UTC (permalink / raw)
To: Steven E. Harris; +Cc: git
On Sun, Jan 24, 2010 at 06:34:11PM -0500, Steven E. Harris wrote:
> 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?
Rebases or other jumps. New tip of 'master' will always be descendant of
old tip of 'master', never a commit from a parallel commit line. This is
preserved over commits and merges, but not over operations that rewrite
history - rebase, filter-branch and such.
The term "fast-forward" is used commonly in this sense. E.g. git push
will typically deny you to push out a branch that is not fastforwarding
the currently pushed out branch, unless you force it to.
--
Petr "Pasky" Baudis
A lot of people have my books on their bookshelves.
That's the problem, they need to read them. -- Don Knuth
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-01-25 0:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-24 23:34 Understanding git.git's branch policy Steven E. Harris
2010-01-25 0:17 ` Petr Baudis
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.