From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Tharindu Rukshan Bamunuarachchi <btharindu@gmail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: keeping -RT and mainline tree in single repository
Date: Fri, 8 Apr 2011 13:22:20 +0530 [thread overview]
Message-ID: <20110408075217.GA25171@kytes> (raw)
In-Reply-To: <BANLkTikGMG76QhLaGfs-m-SizcaqnZ0mhA@mail.gmail.com>
Hi Tharindu,
Tharindu Rukshan Bamunuarachchi writes:
> at the moment i am pulling latest source from
> git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> and keep my driver development up-to-date with mainline.
>
> i need to port my driver to -rt also.
>
> 1. do i have to pull and use another git repository from RT GIT. i.e.
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git
> 2. how can i use current GIT repository to keep sync with both -RT and
> mainline ?
You just need two remotes -- simply run `git remote add rt
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git`
to add this remote. Then, `git fetch --all` to fetch from all
remotes.
> 3. how can i pull latest commits without switching between branches. (
> i hv two branches ... master & my-own-hacked). Every time i switch to
> master and pull latest code.
A `pull` is a `fetch` plus an additional action depending on the
switches and the situation (merge, merge with rebase, ff merge etc).
You can run `fetch`, irrespective of the branch you're on. However,
you need to switch branches to perform a `merge` operation, because of
the way it works.
Hope that helps.
-- Ram
prev parent reply other threads:[~2011-04-08 7:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-08 7:03 keeping -RT and mainline tree in single repository Tharindu Rukshan Bamunuarachchi
2011-04-08 7:52 ` Ramkumar Ramachandra [this message]
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=20110408075217.GA25171@kytes \
--to=artagnon@gmail.com \
--cc=btharindu@gmail.com \
--cc=git@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.