[git-users] Re: Moving commits from one branch to another (or: My hassles with git-rebase)

Hi, just for the records: John Keeping at g...@vger.kernel.org finally gave me the commands I was looking for: > git rebase --onto svn pushedToSvn master^0 assembles the complete (pushedToSvn..master onto the commits at the svn-branch) history detached and > git checkout -B svn HEAD moved this

Re: [git-users] Rebasing large commit-set including merges

Hi Michael, thank you for your answer. After playing with git grafts and "git filter-tags" according to your suggestion, it causes some different issues. I think, I gave to less information about the situation, so I created a complete new thread (the root of the problem seems to be something d

[git-users] Moving commits from one branch to another (or: My hassles with git-rebase)

Hi there, my team works on a project since some months using a central git-repository and the work isn't finished. Now our customer asked us to deliver our code to their svn after each sprint (every three weeks). In the last four or five days I tried a lot but I have lot's of trouble with thi

[git-users] Rebasing large commit-set including merges

#x27;m confused why I have to solve all these conflicts again. Can you tell me, where I missed something? If you know any smarter way to solve this task, I'd be happy to hear :) Thanks in advance, Stefan Schulze --