From: Paul Mackerras <paulus@samba.org>
To: linuxppc-dev@ozlabs.org
Subject: "merge" branch reset in powerpc.git tree
Date: Fri, 23 Jun 2006 21:44:58 +1000 [thread overview]
Message-ID: <17563.54330.600099.894958@cargo.ozlabs.ibm.com> (raw)
If you are following the powerpc.git tree, and you pull the "merge"
branch, you will need to reset it to have commit ID
5fa21d821f6972e70942f2c555ec29dde962bdb2 as its head. That's also the
head of the "master" branch and of Linus' linux-2.6 tree at the
moment.
This is because there was a merge between the "master" branch and the
linux-2.6 tree which Linus didn't pull - instead he did a new merge.
The merge I did is now redundant, and needs to be removed to keep the
powerpc and linux-2.6 trees in sync.
Paul.
next reply other threads:[~2006-06-23 11:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-23 11:44 Paul Mackerras [this message]
2006-06-23 16:48 ` "merge" branch reset in powerpc.git tree Dave C Boutcher
2006-06-23 19:10 ` Josh Boyer
2006-06-23 19:24 ` Arnd Bergmann
2006-06-23 19:28 ` Josh Boyer
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=17563.54330.600099.894958@cargo.ozlabs.ibm.com \
--to=paulus@samba.org \
--cc=linuxppc-dev@ozlabs.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).