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

Re: how to merge sub directory or file?

From
KKKonstantin Khomoutov <flatworm@users.sourceforge.net>
Date
Nov 7, 2011, 15:37 UTC
Message-ID
<20111107193708.6cf2ae81.kostix@domain007.com>
In-Reply-To
<8B3D19E0-2181-4E9C-943F-CA26A399E0D9@gmail.com>

On Mon, 7 Nov 2011 22:54:18 +0800 Emily <lingyan.ren@gmail.com> wrote:

> I have two git projects A and B, content of B is subset of A. For
> example, Project  A and B's tree are as below:
[...]
> When there's new changes in project A, how can I merge them to
> project B without changing B's directory structure?
> 
> Your help will be highly appreciated.

Subtree merging maybe? See http://progit.org/book/ch6-7.html

Previous: EmilyNext: Emily Ren
Message 8 of 9 in “BUG. Git config pager when --edit”
  1. Alexey ShumkinNov 7, 2011
  2. Frans KlaverNov 7, 2011
  3. Jeff KingNov 7, 2011
  4. Junio C HamanoNov 7, 2011
  5. Jeff KingNov 7, 2011
  6. Frans KlaverNov 7, 2011
  7. how to merge sub directory or file?Emily, Nov 7, 2011
  8. Konstantin KhomoutovNov 7, 2011
  9. Emily RenNov 8, 2011

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.