Question

I am very confused, I have read several posts, blogs and articles and don’t know where to go. I am using an svn server repo that I pull down with git svn and work on. I am currently the only person developing this ( i.e. no upstream changes ) .

So i have a local git topic branch vacation, which i need to merge back into master to dcommit, but i don’t want to squash all the commits into one big one.

I tried to do a git rebase -i master and it erased 90% of my changes.

do i do a

git checkout master
git rebase vacation
git svn docmmit

Or a

git checkout vacation
git rebase master 
git checkout master 
git merge vacation --ff-only 
git svn docmmit?

I am afraid of that way b/c what happened when i tried before
can someone please briefly explain what I should do and why I have to do it that way?

Answer 1

so I think i figured it out.

git checkout vacation
git rebase master 
[ masters's chages put behind this branches, replay every commit ]
git checkout master
git merge --ff-only vacation
git svn dcommit 
[ each change goes into svn as seperate commit ]

I had no upstream changes, but this was exactly what i wanted.