From: Dave Quigley <dpquigl@tycho.nsa.gov>
Date: Wed, 09 Jul 2008 00:14:28 GMT
Subject: Merging a foreign tree into a bare repository.
Message-ID: <1215562468.4199.26.camel@moss-terrapins.epoch.ncsc.mil>

Hello,
   I created a bare copy of Linus' 2.6 kernel tree which I am using for
some public development. I have a branch in this tree called patchset
which has a series of commits based on a patch set that I have. Now I
want to update this copy from the kernel.org git repository and rebase
the patches in the patchset branch. I typed git-fetch <URL to Linus'
tree> and it successfully fetched the remote objects. I tried to then
merge them but you need a working directory to merge the changes which
makes sense. Normally if I had a working directory I would use
git-rebase to rebase my patches on a working tree but since this is a
bare repository I can't do that. How would one go about doing this with
a bare repository? Is there a better way of doing this that I am not
aware of? Is my work flow completely off?

Dave