2009/11/11 Daniele Segato <daniele.bilug@xxxxxxxxx>: > On Wed, Nov 11, 2009 at 1:14 PM, Yann Simon <yann.simon.fr@xxxxxxxxx> 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 >> > hum > but I don't want to push those files I explained myself not well. In my "work" branch, there is "local changes", with the local configuration files and then "commit xyz to push" That's why I make a git cherry-pick work to get the last commit, the one to push. Yann -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html