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

Re: How to maintain private/secret/confidential branch.

From
Nick Andrew <nick@nick-andrew.net>
Date
Dec 14, 2008, 14:55 UTC
Message-ID
<20081214145518.GA26380@mail.local.tull.net>
In-Reply-To
<c55009e70812140549t6547c1d6jf7780f91b5074e73@mail.gmail.com>
On Sun, Dec 14, 2008 at 02:49:50PM +0100, Łukasz Lew wrote:
Show 11 quoted lines
> I don't know how to make such a scenario work:
> - two repositories: pub, priv
> - priv is clone/branch of pub
> - there is some constant developement both in pub and priv
> - there are regular syncs with pub in priv
> 
> Problem:
> Occasionally I want to push some changes from priv to pub.
> Then after syncing with pub I want to get as few conflicts as possible.
> 
> Is it possible to do with git?

Git can do almost anything. One should instead ask "How to do this with git?" :-)

If I understand your problem, you could solve it with git cherry-pick and rebase. On priv, make a for-public branch from a pub branch. Then cherry-pick the commits you want from your private branch into the for-public branch. Push your for-public branch to pub, then rebase your private branch.

Nick.
Previous: Łukasz LewNext: Łukasz Lew
Message 2 of 11 in “How to maintain private/secret/confidential branch.”
  1. Łukasz LewDec 14, 2008
  2. Nick AndrewDec 14, 2008
  3. Łukasz LewDec 14, 2008
  4. Alexander PotashevDec 14, 2008
  5. Łukasz LewDec 14, 2008
  6. Daniel BarkalowDec 15, 2008
  7. Łukasz LewDec 17, 2008
  8. Daniel BarkalowDec 17, 2008
  9. Łukasz LewDec 17, 2008
  10. Daniel BarkalowDec 18, 2008
  11. Sitaram ChamartyDec 14, 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.