From: Tony Lindgren <tony@atomide.com>
To: linux-omap-open-source@linux.omap.com
Subject: Git tree updated
Date: Thu, 1 Mar 2007 06:33:32 -0800 [thread overview]
Message-ID: <20070301143330.GF26097@atomide.com> (raw)
Hi all,
As discussed earlier, I've made some changes to our git tree to make it
easier to send patches upstream. I've added some branches internally to
the git tree, and the master branch is based on these new branches.
>From usage point of view, this change is transparent. Git pull should
work as earlier, there are just new branches there. The master branch
is still our development branch, and the other branches are just queues
for upstream.
Now we have following branches:
linus
\
omap-fixes
\
omap-upstream
\
omap-drivers
\
master
The branches have following purpose:
linus Linus' mainline tree
omap-fixes Queue of omap fixes for -rcN series
omap-upstream Queue of omap core patches for next merge window
omap-drivers Queue of omap drivers for next merge window
master Linux omap tree
I'll be rebasing the omap-fixes, omap-upstream, and omap-drivers branches
against the mainline tree, and then merging the changes to the master
branch.
Sorry if this change took a bit longer than expected, I got interrupted
with few other things and was not happy with the branch layout until
today :)
In case anybody is wondering, I rebuilt the new master branch by
applying the patch queues on top of 2.6.20 to various branches,
and then merged in our old tree so the resulting trees were identical.
Today I also updated the new tree few times to make sure things work
out as planned, so the tree is now in sync with the mainline tree.
Regards,
Tony
next reply other threads:[~2007-03-01 14:33 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-01 14:33 Tony Lindgren [this message]
2007-03-16 18:57 ` Git tree updated Dirk Behme
2007-03-19 12:39 ` tony
-- strict thread matches above, loose matches on Subject: below --
2007-05-08 3:19 Tony Lindgren
2007-05-08 12:05 ` Trilok Soni
2007-05-08 16:26 ` Tony Lindgren
2007-05-08 17:45 ` Woodruff, Richard
2007-05-08 17:51 ` Syed Mohammed, Khasim
2007-05-08 17:58 ` Tony Lindgren
2007-05-08 18:02 ` Syed Mohammed, Khasim
2007-05-08 18:19 ` Tony Lindgren
2007-05-08 18:44 ` Syed Mohammed, Khasim
2007-05-10 15:49 ` Dirk Behme
2007-05-10 16:03 ` Tony Lindgren
2007-07-11 13:04 Tony Lindgren
2007-07-11 16:51 ` Syed Mohammed, Khasim
2007-07-11 23:24 ` Kyungmin Park
[not found] ` <ae36f8040707111843m274eb2fdlc0c38042c6af8daa@mail.gmail.com>
2007-07-12 1:44 ` Luís Vitório Cargnini
2007-07-12 2:03 ` Nishanth Menon
2007-07-12 2:18 ` Luís Vitório Cargnini
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=20070301143330.GF26097@atomide.com \
--to=tony@atomide.com \
--cc=linux-omap-open-source@linux.omap.com \
/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