linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Nate Case <ncase@xes-inc.com>
To: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev <linuxppc-dev@ozlabs.org>
Subject: Git branch conventions
Date: Thu, 11 Sep 2008 15:22:57 -0500	[thread overview]
Message-ID: <1221164577.10636.390.camel@localhost.localdomain> (raw)

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>

                 reply	other threads:[~2008-09-11 21:07 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=1221164577.10636.390.camel@localhost.localdomain \
    --to=ncase@xes-inc.com \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=paulus@samba.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).