{"thread":{"id":"27035","subject":"keeping -RT and mainline tree in single repository","startedAt":"2011-04-08T07:03:25Z","lastAt":"2011-04-08T07:52:20Z","messageCount":2,"participants":["Tharindu Rukshan Bamunuarachchi","Ramkumar Ramachandra"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"165402","messageId":"BANLkTikGMG76QhLaGfs-m-SizcaqnZ0mhA@mail.gmail.com","threadId":"27035","inReplyTo":null,"subject":"keeping -RT and mainline tree in single repository","fromName":"Tharindu Rukshan Bamunuarachchi","fromEmail":"btharindu@gmail.com","sentAt":"2011-04-08T07:03:25Z","receivedAt":"2011-04-08T07:03:25Z","isPatch":false,"sender":{"key":"btharindu@gmail.com","avatar":null},"body":"hi All,\n\nat the moment i am pulling latest source from\ngit://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\nand keep my driver development up-to-date with mainline.\n\ni need to port my driver to -rt also.\n\n1. do i have to pull and use another git repository from RT GIT. i.e.\ngit://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git\n2. how can i use current GIT repository to keep sync with both -RT and\nmainline ?\n3. how can i pull latest commits without switching between branches. (\ni hv two branches ... master & my-own-hacked). Every time i switch to\nmaster and pull latest code.\n\nReally appreciate if you can point howto/resource ?\n\nThanks in advance\n__\nTharindu \"R\" Bamunuarachchi.\n"},{"id":"165409","messageId":"20110408075217.GA25171@kytes","threadId":"27035","inReplyTo":"BANLkTikGMG76QhLaGfs-m-SizcaqnZ0mhA@mail.gmail.com","subject":"Re: keeping -RT and mainline tree in single repository","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2011-04-08T07:52:20Z","receivedAt":"2011-04-08T07:52:20Z","isPatch":false,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Hi Tharindu,\n\nTharindu Rukshan Bamunuarachchi writes:\n> at the moment i am pulling latest source from\n> git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n> and keep my driver development up-to-date with mainline.\n> \n> i need to port my driver to -rt also.\n> \n> 1. do i have to pull and use another git repository from RT GIT. i.e.\n> git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git\n> 2. how can i use current GIT repository to keep sync with both -RT and\n> mainline ?\n\nYou just need two remotes -- simply run `git remote add rt\ngit://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git`\nto add this remote.  Then, `git fetch --all` to fetch from all\nremotes.\n\n> 3. how can i pull latest commits without switching between branches. (\n> i hv two branches ... master & my-own-hacked). Every time i switch to\n> master and pull latest code.\n\nA `pull` is a `fetch` plus an additional action depending on the\nswitches and the situation (merge, merge with rebase, ff merge etc).\nYou can run `fetch`, irrespective of the branch you're on.  However,\nyou need to switch branches to perform a `merge` operation, because of\nthe way it works.\n\nHope that helps.\n\n-- Ram\n"}]}