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

Re: excluding files from a merge

From
Nanako Shiraishi <nanako3@lavabit.com>
Date
Mar 15, 2009, 22:14 UTC
Message-ID
<20090316071440.6117@nanako3.lavabit.com>
In-Reply-To
<76718490903150547o1c791d35r5d71000b481f443b@mail.gmail.com>
Quoting Jay Soffian <jaysoffian@gmail.com>:
Show 10 quoted lines
> On Sat, Mar 14, 2009 at 9:23 PM, Daniel Jacobs <djacobs7@gmail.com> wrote:
>> I would like it if every file was merged, except for files that were explictly
>> excluded from a merge between these two branches.  Is there a good way to do
>> this?
>
> Please see http://thread.gmane.org/gmane.comp.version-control.git/110488
> (Is there a way to exclude user-specified files or directories from
> participating in merges?)
>
> I believe it is the same use case, and Junio provided a very detailed reply.
Would it help to have the final summary by Sitaram Chamarty
    http://article.gmane.org/gmane.comp.version-control.git/110697
somewhere under Documentation/howto?
-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/
Previous: Jay SoffianNext: Jay Soffian
Message 3 of 4 in “excluding files from a merge”
  1. Daniel JacobsMar 15, 2009
  2. Jay SoffianMar 15, 2009
  3. Nanako ShiraishiMar 15, 2009
  4. Jay SoffianMar 16, 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.