From: Junio C Hamano <gitster@pobox.com>
To: Dominique Quatravaux <domq@google.com>
Cc: Johannes Sixt <j.sixt@viscovery.net>,
git@vger.kernel.org, Thomas Rast <trast@inf.ethz.ch>
Subject: Re: [PATCH 2/2] rebase -i: new option --name-rev
Date: Fri, 09 Mar 2012 01:45:25 -0800 [thread overview]
Message-ID: <7vty1y85vu.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CAJh6GrGEix8qfAuJamWzcr69=LjkZ-O9B=Vorvy_KTcJe3TcPA@mail.gmail.com> (Dominique Quatravaux's message of "Fri, 9 Mar 2012 10:04:12 +0100")
Dominique Quatravaux <domq@google.com> writes:
> On Fri, Mar 9, 2012 at 8:22 AM, Johannes Sixt <j.sixt@viscovery.net> wrote:
>> Rebase -i happily linearizes mergy history, so this
>> does have some merits even today.
>
> Right, my personal itch is to "transplant" topic branches without their merge
> history getting in the way,...
> ...
> pick 1234abc (topicB~2) Cool shiny new stuff
> pick 234abc1 (master~2) Something something master
> pick 34abc12 (master~1) Fix something something
> pick 4abc123 (topicB) Fix shiny new stuff
Ok. I didn't consider the "flattening" aspect of the rebase, and the
above makes sense to me.
next prev parent reply other threads:[~2012-03-09 9:45 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 10:42 [PATCH 1/2] rebase -i: optimize the creation of the todo file Dominique Quatravaux
2012-03-08 10:42 ` [PATCH 2/2] rebase -i: new option --name-rev Dominique Quatravaux
2012-03-08 10:56 ` Thomas Rast
2012-03-08 11:57 ` Dominique Quatravaux
2012-03-08 18:58 ` Junio C Hamano
2012-03-09 7:58 ` Dominique Quatravaux
2012-03-08 19:08 ` Junio C Hamano
2012-03-08 22:13 ` Junio C Hamano
2012-03-09 7:22 ` Johannes Sixt
2012-03-09 9:04 ` Dominique Quatravaux
2012-03-09 9:45 ` Junio C Hamano [this message]
2012-03-08 10:48 ` [PATCH 1/2] rebase -i: optimize the creation of the todo file Thomas Rast
2012-03-08 11:48 ` Dominique Quatravaux
2012-03-08 11:55 ` Thomas Rast
2012-03-08 11:20 ` Johannes Sixt
2012-03-08 11:36 ` Dominique Quatravaux
2012-03-08 11:41 ` Dominique Quatravaux
2012-03-08 11:51 ` 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=7vty1y85vu.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=domq@google.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=trast@inf.ethz.ch \
/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).