Re: Locally manage user/branch setting files without pushing them remotely

From: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Date: Nov 11, 2009, 13:46 UTC
Message-ID: <4d8e3fd30911110546m1a5012f2g99f2d0c7ca829876@mail.gmail.com>
In-Reply-To: <9accb4400911110500y37437dc5h16388b07a734dc6d@mail.gmail.com>

On Wed, Nov 11, 2009 at 2:00 PM, Daniele Segato <daniele.bilug@gmail.com> wrote:

Show 18 quoted lines

> On Wed, Nov 11, 2009 at 1:14 PM, Yann Simon <yann.simon.fr@gmail.com> wrote:
>> I am in the same situation.
>> What I did is not to add these files to .gitignore.
>> On my "work" branch, I commited these files in a separate commit
>> "local changes".
>> When I want to push to svn, I switch to the branch "master", and
>> cherry-pick the commit I want to push.
>> $ git checkout master
>> $ git svn rebase
>> $ git cherry-pick work
>> $ git svn dcommit
>> $ git checkout work
>> $ git rebase master
>>
>> This workflow could maybe be better. Suggestions welcome.
>
> hum
> but I don't want to push those files

If you follow Yann's advise you won't push to the svn repo the "private" files, they will be /only/ stored in you local repo.

The cons of that approach is that you will have to cherrypick all the commits you want to push to the svn repo from the "working branch" to the master branch.

Ciao,

-- 
Paolo