From: Rick Moynihan <rick@calicojack.co.uk>
To: Miklos Vajna <vmiklos@frugalware.org>
Cc: git@vger.kernel.org
Subject: Re: Rebasing Multiple branches at once...
Date: Thu, 16 Oct 2008 15:48:11 +0100 [thread overview]
Message-ID: <48F7542B.1050909@calicojack.co.uk> (raw)
In-Reply-To: <20081016135908.GI536@genesis.frugalware.org>
Miklos Vajna wrote:
> On Thu, Oct 16, 2008 at 01:17:20PM +0100, Rick Moynihan <rick@calicojack.co.uk> wrote:
>> I have a master branch, a dev branch and a number of feature branches from
>> dev. And I was wondering if there was an easy way to rebase dev and all of
>> it's sub-branches onto master.
>
> In general this is considered harmful. Why do you rebase your branch
> from time to time? For example in git.git, topic branches are based on
> master, then merged to master when they are ready, but they are never
> rebased.
Yes, but my understanding is that it's only harmful if you publish the
branch (or dependent branches) which are being rebased.
So rebasing is very bad in these circumstances, but I fail to see why
it's bad if these branches are kept private.
R.
next prev parent reply other threads:[~2008-10-16 14:49 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 [this message]
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
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=48F7542B.1050909@calicojack.co.uk \
--to=rick@calicojack.co.uk \
--cc=git@vger.kernel.org \
--cc=vmiklos@frugalware.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.
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).