linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* Git branch conventions
@ 2008-09-11 20:22 Nate Case
  0 siblings, 0 replies; only message in thread
From: Nate Case @ 2008-09-11 20:22 UTC (permalink / raw)
  To: Paul Mackerras; +Cc: linuxppc-dev

Hi Paul,

Can you (or anyone really) describe what the usage conventions are for
the master, powerpc-next, and merge branches in your tree?

The 'master' and 'powerpc-next' branches appear to be identical right
now.  I can see that you usually submit pull requests to Linus via your
'merge' branch.  I also notice that there are changes in 'merge' that
aren't in 'master' or 'powerpc-next'.  Likewise, I see changes in
'powerpc-next'/'master' that aren't in 'merge'.  Is
'powerpc-next'/'master' purely 2.6.28 material currently while 'merge'
is for whatever the next target release is (currently 2.6.27)?

I couldn't find this explained officially anywhere, so I thought I'd
ask.  Maybe it'd shed some light for other people too.

-- 
Nate Case <ncase@xes-inc.com>

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-09-11 21:07 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-11 20:22 Git branch conventions Nate Case

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).