From: Clemens Buchacher <drizzd@aon.at>
To: "Dirk Süsserott" <newsletter@dirk.my1.cc>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Rebase a whole tree from one commit to another?
Date: Sat, 16 May 2009 15:49:06 +0200 [thread overview]
Message-ID: <20090516134906.GA19110@localhost> (raw)
In-Reply-To: <4A0DC4CD.1030401@dirk.my1.cc>
On Fri, May 15, 2009 at 09:38:53PM +0200, Dirk Süsserott wrote:
>
> git rebase new-master branch-a
> git rebase branch-a branch-b
> git rebase branch-b branch-c
>
You probably want something like
git rebase new-master branch-a
git rebase --onto branch-a branch-a@{1} branch-b
git rebase --onto branch-b branch-b@{1} branch-c
instead, because if you have any conflicts during rebase, the rebased
commits will no longer be recognized as identical, causing even more
conflicts in the following rebases.
prev parent reply other threads:[~2009-05-16 13:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-15 19:38 Rebase a whole tree from one commit to another? Dirk Süsserott
2009-05-16 7:35 ` Andreas Ericsson
2009-05-16 13:49 ` Clemens Buchacher [this message]
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=20090516134906.GA19110@localhost \
--to=drizzd@aon.at \
--cc=git@vger.kernel.org \
--cc=newsletter@dirk.my1.cc \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.