git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Merging a foreign tree into a bare repository.

From
DQDave Quigley <dpquigl@tycho.nsa.gov>
Date
Jul 9, 2008, 00:14 UTC
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
Next: Johannes Schindelin
Message 1 of 6 in “Merging a foreign tree into a bare repository.”
  1. Dave QuigleyJul 9, 2008
  2. Johannes SchindelinJul 9, 2008
  3. Alejandro RiveiraJul 9, 2008
  4. Jakub NarebskiJul 9, 2008
  5. Johannes SchindelinJul 9, 2008
  6. Eric RaibleJul 9, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.