From: Francis Moreau <francis.moro@gmail.com>
To: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Michael J Gruber <git@drmicha.warpmail.net>,
git@vger.kernel.org
Subject: Re: git-rebase skips automatically no more needed commits
Date: Fri, 9 Sep 2011 15:25:24 +0200 [thread overview]
Message-ID: <CAC9WiBj0TJa44Ay4e8=VyMzfUGxWd1NW8rjrxxkCSx5K6BthRw@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1109090900301.12564@debian>
On Fri, Sep 9, 2011 at 3:06 PM, Martin von Zweigbergk
<martin.von.zweigbergk@gmail.com> wrote:
> On Fri, 9 Sep 2011, Francis Moreau wrote:
>
>> On Fri, Sep 9, 2011 at 4:23 AM, Martin von Zweigbergk
>> <martin.von.zweigbergk@gmail.com> wrote:
>>
>> > you are right that
>> > "git rebase --onto master foo~10 foo" could potentially filter out
>> > patches already in foo..master, without calculating patch-ids for all
>> > commits in master..foo for that matter. I think that would make sense
>>
>> you meant master..foo~10, didn't you ?
>
> Yes. (I actually did mean "all commits in master..foo", but "_any_
> commits in master..foo~10" is more clear and exact.)
>
>> please let me know when you submitting your work, I'm interested to see it.
>
> Will do. It's not really that much work, but I'm not sure when I will
> have time for it. If you or anyone else is interested in doing it, you
> are of course welcome.
I'm a simple mortal user ;)
>
>> > necessary, we could have a flag to disable the filtering e.g. when the
>> > user knows that master is part of a completely separate history from
>> > foo.
>>
>> Can't git figure this out itself ? (I'm not saying the switch is useless)
>
> Yes, but this hypothetical flag would only be to speed things up by
> avoid going to the roots to find out that the histories are disjoint.
You're right but in my (mortal) experience, I'm always rebasing
branches onto another one which is not disjoint, so I'm assuming it's
the (very) common case, but I may be wrong. And what I'm assuming is
correct, I think it's make more sense to do the filtering by default
unless the flag tells to do otherwise.
Thanks
--
Francis
next prev parent reply other threads:[~2011-09-09 13:25 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-06 16:08 git-rebase skips automatically no more needed commits Francis Moreau
2011-09-06 17:09 ` Junio C Hamano
2011-09-06 19:28 ` Francis Moreau
2011-09-07 13:19 ` Michael J Gruber
[not found] ` <CAC9WiBi_bkLNJZckq2fr3eb6ie+KVfauE_PyA3GcaW5Ga-isFw@mail.gmail.com>
2011-09-07 16:29 ` Junio C Hamano
2011-09-08 7:10 ` Francis Moreau
2011-09-08 13:14 ` Martin von Zweigbergk
[not found] ` <CAC9WiBiMYUfaPtrXyW=W7qaZnJqLeFO-B3od7X4u8wUrb8hfUA@mail.gmail.com>
2011-09-09 2:23 ` Martin von Zweigbergk
2011-09-09 6:43 ` Francis Moreau
2011-09-09 13:06 ` Martin von Zweigbergk
2011-09-09 13:25 ` Francis Moreau [this message]
2011-09-15 2:19 ` Martin von Zweigbergk
2011-09-15 3:41 ` Junio C Hamano
2011-09-16 1:27 ` Martin von Zweigbergk
2011-09-20 20:45 ` Martin von Zweigbergk
2011-09-24 9:12 ` Ramkumar Ramachandra
2011-09-25 3:25 ` Martin von Zweigbergk
2011-09-26 9:10 ` Thomas Rast
2011-09-28 14:49 ` Martin von Zweigbergk
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='CAC9WiBj0TJa44Ay4e8=VyMzfUGxWd1NW8rjrxxkCSx5K6BthRw@mail.gmail.com' \
--to=francis.moro@gmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.von.zweigbergk@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 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 NNTP newsgroup(s).