On 7/5/07, Sean Kelley <svk.sweng@xxxxxxxxx> wrote:
Hi, I have a situation where we have a local GIT repository that is based on v2.6.17. We initially added the source tarball to an empty repository and then started applying changes to it. Looking back, that might not have been the best idea 400 commits later. My goal is to eventually bring our repository closer to mainline revisions so as to make it easier to actually contribute back to the community. So how can I fix my repository so as to give it visibility to Linus' kernel? Here is my initial thoughts: 1) Clone kernel.org kernel and it is Master 2) Create a local Head based on 2.6.17 and call it Local 3) Pull my existing heavily patched repository into the Local branch and merge Is it possible then to see our 400 odd commits then in the Local branch on top of 2.6.17 so that we can see not only our history but also the history that came before? Then as Master advances we can see about backporting and bringing our code close enough to mainline kernel to actually be able to contribute back to the community and submit patches. Is this realistic approach. I am unsure of the GIT commands that I need to do this? Thanks, Sean
If I understand correctly, what you might want to do is keep your current master branch, pull in the mainline kernel to a separate branch, and rebase your master on the mainline branch. git checkout master git rebase mainline will find the last common commit between two branches, then plop all the mainline commits on top, then proceed to merge in your changes on the master branch, one-by-one, stopping if there are any conflicts and allowing you to resolve as they happen. Then your 400 commits will be on top and you can rebase whenever and still see them on top. -Dan "Puzzles" Chokola - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
