[git-users] Proper git model for multiple instance

2012-01-30 Thread Michal Holub
Hi All, I've stepped in a company that runs an existing CMS for their main website. They asked me a while ago to setup 5 new websites with that CMS. I've decided to have the original as branch MASTER and the other 5 as separate branches. When I make a feature/bug fix that needs to propagate to

[git-users] Re: git-svn: mapping individual subversion branches

2012-01-30 Thread Carsten
Hi all, Am 2012-01-25 09:59, schrieb chris: I'm trying to convert a couple of Subversion repositories to git. The structure looks like this: / + project1 + trunk + src + tags + 1.0rc1 + src + branches + 1.x + src + releases + 1.0

[git-users] Re: git-svn: mapping individual subversion branches

2012-01-30 Thread chris
+ project2    + trunk    + tags    + branches    + releases    + some_branch      + src [...] But how do I map the single branch some_branch in project2? Just for the record: I got a direct reply stating: Use git config --add svn-remote.svn.fetch

[git-users] Re: Proper git model for multiple instance

2012-01-30 Thread Lars Pensjö
I think you need to say a little more of the 5 websites. Is it 5 different applications, based on common libraries? How much commonality is it? Do they depend on each other in release cycles? Maybe it is the same product, tweaked to support 5 major customers with various requirements? -- You

[git-users] Re: git format-patch does not apply

2012-01-30 Thread Johannes Müller
On Jan 22, 12:23 am, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: I think the details must be in what was inside these commits. Would be interesting if you can share a repository where you can recreate this. I was not able to reproduce this problem on a new repository. Finally, I solved it