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

From: Łukasz Lew <lukasz.lew@gmail.com>
Date: Dec 14, 2008, 15:38 UTC
Message-ID: <c55009e70812140738l8b51adax77cc6e507971554e@mail.gmail.com>
In-Reply-To: <20081214145518.GA26380@mail.local.tull.net>

Thanks Nick, thats really helpful (and surprisingly simple). I have a couple more questions:

On Sun, Dec 14, 2008 at 15:55, Nick Andrew <nick@nick-andrew.net> wrote:

Show 15 quoted lines

> On Sun, Dec 14, 2008 at 02:49:50PM +0100, Łukasz Lew wrote:
>> 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?" :-)

So I've heard, but not yet experienced it myself. I'm thrilled to try.

Show 5 quoted lines

>
> 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.

That almost works. Can I somehow split existing commits just like in git-add -p?

> Push your for-public branch to pub,
> then rebase your private branch.

Rebase to the tip of master? Is it needed? Ie. cherry-pick does not remove the patch from the master in priv.

If I now pull from pub, I will get the same change and it mereges nicely :D

Can I get away without creating for_pub branch? maybe cherry pick in pub from priv somehow?

>
> Nick.
>