Re: Moving commits from one branch to another (improving my git fu!)

From: Noufal Ibrahim <noufal@nibrahim.net.in>
Date: Oct 22, 2013, 12:42 UTC
Message-ID: <87d2mx1nq1.fsf@sanitarium.localdomain>
In-Reply-To: <CAC+QLdSjTjftgUBy-1cHbATZnX-UO3PavUaLwErhCaxBa-hPmQ@mail.gmail.com>

Mandeep Sandhu <mandeepsandhu.chd@gmail.com> writes:

Show 14 quoted lines

> Hi All,
>
> I'm in a bit of a pickle! :) So I've come to ask for help from the guru's here.
>
> My story is not unique but somehow the various suggested solutions
> don't seem to work in my case.
>
> * I was working on a feature which was supposed to be done off our
> 'dev' branch. But instead I forgot and branched out my topic branch
> from master (or as we call it 'stable').
> * I did 2 commits and finished off my work. Only later realizing that
> it had to be done off 'dev'.
> * Now I want to move my 2 commits (which are the top 2 commits on my
> topic branch) to a new branch which is branched off 'dev'.

I had a situtation similar to this a while ago and used the --onto option to rebase. The details are at http://nibrahim.net.in/2012/01/09/moving_topic_branches_in_git.html

[...]

-- 
Cordially,
Noufal
http://nibrahim.net.in