From: Howard Miller <howard@e-learndesign.co.uk>
To: git@vger.kernel.org
Subject: Can't get git rebase --onto to work
Date: Thu, 2 Jun 2011 11:17:41 +0100 [thread overview]
Message-ID: <BANLkTikF7p_XsU6YJ81bq10S3nL6tBsApg@mail.gmail.com> (raw)
Trying to explain this as concisely as possible.
I started with the following branches (names changed to protect the guilty)...
* clientA
* clientB
both have a common ancestry....
I then checked out clientB created a new branch clientB_patch and did
a load of work and commits.
However, I actually wanted all those commits to apply to clientA
branch instead so....
git checkout clientA
git checkout -b clientA_patch (to ensure I didn't wreck original branch)
git rebase --onto clientA_patch clientB clientB_patch
It says "rewinding" head and then applies the commits I would have expected.
However, I have now been switched to the 'clientB_patch' branch and it
says that it differs from its tracked remote branch by hundreds of
commits.
clientA_patch is unchanged. It seems to have mangled clientB_patch and
done nothing to clientA_patch. Where did I go wrong?
TIA
next reply other threads:[~2011-06-02 10:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-02 10:17 Howard Miller [this message]
2011-06-02 10:32 ` Can't get git rebase --onto to work Carlos Martín Nieto
2011-06-02 10:38 ` Howard Miller
2011-06-02 10:38 ` Tim Guirgies
2011-06-02 10:43 ` Howard Miller
2011-06-02 10:52 ` Tim Guirgies
2011-06-02 10:58 ` Howard Miller
2011-06-02 11:18 ` David
2011-06-02 11:18 ` Tim Guirgies
2011-06-02 11:28 ` Howard Miller
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=BANLkTikF7p_XsU6YJ81bq10S3nL6tBsApg@mail.gmail.com \
--to=howard@e-learndesign.co.uk \
--cc=git@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).