Re: [GIT] Networking

Ingo Molnar
2011-03-11T06:37:06Z

* Steven Rostedt <rostedt@goodmis.org> wrote:

> On Thu, Mar 10, 2011 at 04:51:34PM -0800, Linus Torvalds wrote:
> >
> > The reasons can be any of:
> >
> > - "I don't want to get too far away from upstream". This is very
> > understandable, but I have asked people to please _not_ merge "random
> > trees of the day". Please use major releases for this (or, if worst
> > comes to worst, -rc releases) rather than just do something else.
>
> What are you throughts on starting work from a tree. Most of my work is usually
> based off of some branch in tip, but sometimes when I'm pulling in patches that
> are not really related to anything, I just simply grab whatever the latest Linus
> branch is and start from there.
>
> Is it preferable to instead start from one of the official releases?

Yes, for clarity of merge history i'm generally asking all people who send pull
requests to -tip to use official -rc's as bases (or -tip branches), *not* some
random daily -git snapshot. If a -git snapshot has to be merged for a good reason
then please amend the merge commit with the Merge-Reason tag describing the good
reason you had.

Thanks,

Ingo