From: Noufal Ibrahim <noufal@nibrahim.net.in>
To: Mandeep Sandhu <mandeepsandhu.chd@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Moving commits from one branch to another (improving my git fu!)
Date: Tue, 22 Oct 2013 18:12:14 +0530 [thread overview]
Message-ID: <87d2mx1nq1.fsf@sanitarium.localdomain> (raw)
In-Reply-To: <CAC+QLdSjTjftgUBy-1cHbATZnX-UO3PavUaLwErhCaxBa-hPmQ@mail.gmail.com> (Mandeep Sandhu's message of "Tue, 22 Oct 2013 11:08:41 +0530")
Mandeep Sandhu <mandeepsandhu.chd@gmail.com> writes:
> 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
next prev parent reply other threads:[~2013-10-22 13:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-22 5:38 Moving commits from one branch to another (improving my git fu!) Mandeep Sandhu
2013-10-22 5:52 ` Peter Krefting
2013-10-22 6:11 ` Mandeep Sandhu
2013-10-22 6:00 ` Bryan Turner
2013-10-22 6:15 ` Mandeep Sandhu
2013-10-22 12:42 ` Noufal Ibrahim [this message]
2013-10-22 12:51 ` Mandeep Sandhu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d2mx1nq1.fsf@sanitarium.localdomain \
--to=noufal@nibrahim.net.in \
--cc=git@vger.kernel.org \
--cc=mandeepsandhu.chd@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox