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

Re: Vendor-Branch setup

From
Sergey Organov <sorganov@gmail.com>
Date
Oct 8, 2014, 14:46 UTC
Message-ID
<87vbnupqk2.fsf@osv.gnss.ru>
In-Reply-To
<CAOHZ5L4aAT0vYfJ4g=5NmED9=nWyHS1ATf+15Y060uiz=CtkRQ@mail.gmail.com>
Adrian Stern <adrian.stern@unchained.ch> writes:
Show 5 quoted lines
> Hi
>
> I have a Vendro-Branch setup where i store the official code in my own
> repository. Next to that i have a Delta-Branch where i store only the
> changed files different to the Vendor-Branch.

This Delta-Branch is the cause of your problems, I think. Why do you need it at all? If you checkout it, what could you do with the result?

Instead, why don't you simply create your own branch from the root of the vendor branch and make your own changes on this branch? That's how it's supposed to work. Git is very efficient at storing only deltas internally so you shouldn't care about it.

-- 
Sergey.
Previous: Adrian Stern
Message 2 of 2 in “Vendor-Branch setup”
  1. Adrian SternOct 8, 2014
  2. Sergey OrganovOct 8, 2014

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.