From: Avi Kivity <avi@redhat.com>
To: Stephan Beyer <s-beyer@gmx.net>
Cc: Stephen Haberman <stephen@exigencecorp.com>, git@vger.kernel.org
Subject: Re: [PATCH RFC] rebase--interactive: if preserving merges, use first-parent to limit what is shown.
Date: Tue, 07 Oct 2008 14:22:26 +0200 [thread overview]
Message-ID: <48EB5482.7050207@redhat.com> (raw)
In-Reply-To: <20081007120700.GC7209@leksak.fem-net>
Stephan Beyer wrote:
> Hi,
>
> Avi Kivity wrote:
>
>> If git rebase is to handle nonlinear history, it needs much more
>> expressive commands; not only saying which commit to pick, but also what
>> the commit's parents shall be.
>>
>
> git-sequencer has a "merge" command for that. I'm really sorry that this has
> not been sent to the list yet. Nevertheless I'm always glad to find testers
> for sequencer, so if you like, fetch
> git://repo.or.cz/git/sbeyer.git seq-builtin-dev
>
>
But this isn't a merge; it's more of a 'pick into this branch' instead.
Maybe 'merge' can do this, but we also need to populate the todo with
the required information (otherwise, git rebase -i without changes to
the todo file will not be a no-op).
--
error compiling committee.c: too many arguments to function
prev parent reply other threads:[~2008-10-07 12:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-05 15:30 git rebase -i -p broken? Avi Kivity
2008-10-06 15:21 ` [PATCH RFC] rebase--interactive: if preserving merges, use first-parent to limit what is shown Stephen Haberman
2008-10-07 2:20 ` Stephen Haberman
2008-10-07 6:36 ` Stephen Haberman
2008-10-07 14:38 ` Shawn O. Pearce
2008-10-07 9:57 ` Avi Kivity
2008-10-07 12:07 ` Stephan Beyer
2008-10-07 12:22 ` Avi Kivity [this message]
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=48EB5482.7050207@redhat.com \
--to=avi@redhat.com \
--cc=git@vger.kernel.org \
--cc=s-beyer@gmx.net \
--cc=stephen@exigencecorp.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).