Re: Moving commits from one branch to another

From: John Keeping <john@keeping.me.uk>
Date: Jan 23, 2013, 12:12 UTC
Message-ID: <20130123121203.GM7498@serenity.lan>
In-Reply-To: <000a01cdf961$bcf773d0$36e65b70$@de>

On Wed, Jan 23, 2013 at 01:04:03PM +0100, Stefan Schulze wrote:

Show 15 quoted lines

> my team uses a central git-repo since >1500 commits and now we have to sync
> (only one-way is necessary for now) our repository every three weeks with an
> external svn-repo.
> I created the new base-directory (incl. trunk/tags/branches) in svn and
> added it to my local repo using git svn init && git fetch.
> Now I have two branches in my local repository (master and "svnbranch") and
> cherry-picked the very first commit from master to svnbranch (it was
> probably not necessary), tagged this commit as "publishedToSvn". Now I want
> to add all commits publishedToSvn..master onto svnbranch. I didn't managed
> to succeed using git-rebase (probably because of the missing common
> commits?) and using git grafts / filter-branch modifies my already published
> master.
> 
> Is there any way to move/copy commits from one branch to another without a
> common base-commit and without a forced push of master?

Did you try "git rebase" with "--onto"? You probably want something like this:

    git rebase --onto svnbranch publishedToSvn master

John