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

Re: Git merge selective files

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 9, 2009, 20:54 UTC
Message-ID
<7v63f5ku1e.fsf@alter.siamese.dyndns.org>
In-Reply-To
<32541b130906091239x1c92a1caxd260983a66e8025f@mail.gmail.com>
Avery Pennarun <apenwarr@gmail.com> writes:
> And the "'merge --squash' and don't commit the changes you don't want"
> option looks okay to me too.

Whatever you do to prepare the tree contents to suit the desire of the original request, I think it is essential not to record the result of such an operation as a merge (because it is not, and it will screw up later merges).

Use of "merge --squash" in this thread is a very good suggestion.
Good job.
Previous: Avery Pennarun
Message 5 of 5 in “Git merge selective files”
  1. joe higtonJun 9, 2009
  2. Avery PennarunJun 9, 2009
  3. Alex RiesenJun 9, 2009
  4. Avery PennarunJun 9, 2009
  5. Junio C HamanoJun 9, 2009

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.