From: "Robin Burchell" <w00t@inspircd.org>
To: "Rick Moynihan" <rick@calicojack.co.uk>
Cc: "David Kastrup" <dak@gnu.org>, git@vger.kernel.org
Subject: Re: Rebasing Multiple branches at once...
Date: Thu, 16 Oct 2008 16:02:38 +0100 [thread overview]
Message-ID: <b19eae4e0810160802x3e91cf48oebe668dc1b6425df@mail.gmail.com> (raw)
In-Reply-To: <48F75657.6010308@calicojack.co.uk>
On Thu, Oct 16, 2008 at 3:57 PM, Rick Moynihan <rick@calicojack.co.uk> wrote:
>
> This appears to be true of the current implementation, but shouldn't it be
> possible to do this as a single operation?
>
> e.g. when the situation is this with dev being the current branch.
>
> o---o---o---o---o master
> \
> o---o---o---o---o dev (*)
> \
> o---o---o topic
>
> Running the hypothetical command:
>
> git rebase master --all
>
> Would produce this:
>
> o---o---o---o---o master
> \
> o---o---o---o---o dev (*)
> \
> o---o---o topic
>
> I think this can be performed right now with a rebase followed by a rebase
> --onto
>
> I can see how if there were conflicts in the rebase from dev, then you would
> need to resolve them all the way up your topic branches also. Is there
> anything else that makes this a bad idea?
>
> R.
Rebase is indeed useful IMHO in situations like this with multiple
related topic branches when needing to pull a single fix or two from
somewhere without messy merges (especially when that will end up with
rather a lot of merge commits in history - one or so for each branch,
which is not exactly desirable).
(resent after I learned how to use 'reply to all', sorry Rick)
next prev parent reply other threads:[~2008-10-16 15:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-16 12:17 Rebasing Multiple branches at once Rick Moynihan
2008-10-16 13:59 ` Miklos Vajna
2008-10-16 14:48 ` Rick Moynihan
2008-10-16 21:00 ` Miklos Vajna
2008-10-17 2:00 ` Junio C Hamano
2008-10-16 13:59 ` David Kastrup
2008-10-16 14:57 ` Rick Moynihan
2008-10-16 15:02 ` Robin Burchell [this message]
2008-10-16 20:27 ` Toby Allsopp
-- strict thread matches above, loose matches on Subject: below --
2016-12-31 8:14 Rebasing multiple " Mike Hommey
2017-01-01 2:40 ` Junio C Hamano
2017-01-02 6:42 ` Jeff King
2017-01-01 8:42 ` Johannes Sixt
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b19eae4e0810160802x3e91cf48oebe668dc1b6425df@mail.gmail.com \
--to=w00t@inspircd.org \
--cc=dak@gnu.org \
--cc=git@vger.kernel.org \
--cc=rick@calicojack.co.uk \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).