From: Johannes Sixt <j.sixt@viscovery.net>
To: Leonid Podolny <leonidp.lists@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Rebasing multiple branches
Date: Tue, 21 Dec 2010 15:06:05 +0100 [thread overview]
Message-ID: <4D10B44D.5090309@viscovery.net> (raw)
In-Reply-To: <4D10AE5B.2080700@gmail.com>
Am 12/21/2010 14:40, schrieb Leonid Podolny:
> B--o--o--o--o--o--o <--branch A
> / \
> o--o--A--o--E <--master C--o--o--o--D <--branch C
> \ /
> C--o--o--o--o--o--o <--branch B
>
> I would like to rebase all three branches A, B and C onto commit E,...
git rebase master A
git rebase master B
git merge A
git rebase -i HEAD C
The last rebase I propose as interactive so that you can remove those
commits before D~3 that you have already rebased, because they are likely
to conflict unnecessarily, and you would --skip them anyway.
(Note: "C" is the branch C, not the commit C. Please make labels
unambiguous next time.)
-- Hannes
next prev parent reply other threads:[~2010-12-21 14:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-21 13:40 Rebasing multiple branches Leonid Podolny
2010-12-21 14:06 ` Johannes Sixt [this message]
2010-12-22 14:36 ` Enrico Weigelt
2010-12-22 14:54 ` Leonid Podolny
2010-12-30 5:35 ` Enrico Weigelt
2010-12-31 14:55 ` Thomas Rast
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=4D10B44D.5090309@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=leonidp.lists@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 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.