On Mon, Mar 26, 2012 at 12:08 PM, Kumar Pande <pandekumar023@xxxxxxxxx> wrote: > Pardon if this embarrassingly simple question, I am new to git haven't > found git-newbies mailing list. > > We have a situation where we want to setup internal git repository that > will be based on say linux-3.3 kernel. > > There are about four engineers working on developing things for custom > hardware. So would create a development branch say companyx-devel and we > will commit all of our changes to this compnayx-devel branch. > > We also want to keep upto date with latest kernel, so say if we want to > move to latest 3.4-rc4 we could rebase (?) our origin to 3.4-rc4, of course > fix any of the conflicts we may find etc. > > We are not sure how to go about setting up the initial import of linux3-3 > kernel into git repository on of my local servers? > > We know we should do following on the server: > > git init --bare > git config core.sharedrepository 1 > So this what we have done so far: git clone --bare --shared http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git git config core.sharedrepository 1 Now on my client side. 1. I checkout and another user John also cloned this repo using command: git clone ssh://gitserver/opt/git/linux.git 2. Now git remote -v shows me git remote -v origin ssh://gitserver/var/git/linux.git (fetch) origin ssh://gitserver/var/git/linux.git (push) 3. created a branch git branch testbranch git checkout testbranch <add some files, edited some files, compile & test> git commit -am "Testing" 4. Now I push the testbranch to gitserver using git push origin testbranch (this seems to have worked To ssh://gitserver/var/git/linux.git * [new branch] testbranch -> testbranch 5. Now another user john can clone this repo and make changes to this testbranch, which I can also pull. So we are good so far. Now we are not clear or confused about is, say in one week or two weeks linus updates the top of linux.git and if we want to rebase our work to top of that tree. What exactly do we need to do ? Would REALLY appreciate the help/guidance... -Kumar -- 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