From: Avi Kivity <avi@redhat.com>
To: Stephen Haberman <stephen@exigencecorp.com>
Cc: 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 11:57:56 +0200 [thread overview]
Message-ID: <48EB32A4.80809@redhat.com> (raw)
In-Reply-To: <20081006212021.04ba9214.stephen@exigencecorp.com>
Stephen Haberman wrote:
> However, t3404 makes a good point that if the right hand of the merge
> has parents that are going to get rebased, the right hand side does
> need to be included/shown/rewritten.
>
>
But, won't those commits get linearized? Won't git rebase pick the
commits into the left-hand side of the merge instead of into the right
hand side?
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.
--
error compiling committee.c: too many arguments to function
next prev parent reply other threads:[~2008-10-07 9:59 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 [this message]
2008-10-07 12:07 ` Stephan Beyer
2008-10-07 12:22 ` Avi Kivity
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=48EB32A4.80809@redhat.com \
--to=avi@redhat.com \
--cc=git@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.