All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Dominique Quatravaux <domq@google.com>
Cc: git@vger.kernel.org
Subject: Re: git rebase and merge commits
Date: Wed, 20 Oct 2010 12:32:01 -0500	[thread overview]
Message-ID: <20101020173201.GA10537@burratino> (raw)
In-Reply-To: <AANLkTikroNPehcyBsueCnJ5hR0idd3cBP4m1KNccdRqL@mail.gmail.com>

Hi Dominique,

Dominique Quatravaux wrote:

> #        A---B---C---K targetbranch
> #       /         \
> #  D---E---F---G---H---I--J srcbranch
> 
> into this:
> 
> #   A---B---C---I'---K'  targetbranch
> #  /             \
> # D---E---F---G---H'---J' srcbranch
> #
> 
> (ie I has been shoved into targetbranch).
> 
> It seemed to me that the first step should be to simply rebase I, H, and J (in
> this order) onto C. Unfortunately git rebase --interactive -p C proposes
[...]

I'm sorry to break this news, but "rebase --interactive --preserve-merges"
(unlike "rebase --preserve-merges" without --interactive) was never
implemented completely.  See the BUGS section of the git-rebase man page.

Luckily, there is a roadmap for anyone interested in implementing it.  Maybe
it could be you?  See [1] and the surrounding thread.

Thanks for your interest,
Jonathan

[1] http://thread.gmane.org/gmane.comp.version-control.git/148059/focus=148144

  reply	other threads:[~2010-10-20 17:35 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-20 16:45 git rebase and merge commits Dominique Quatravaux
2010-10-20 17:32 ` Jonathan Nieder [this message]
2010-10-20 17:44   ` Joshua Jensen
2010-10-20 18:12     ` Joshua Jensen
2010-10-25 11:23   ` Dominique Quatravaux

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=20101020173201.GA10537@burratino \
    --to=jrnieder@gmail.com \
    --cc=domq@google.com \
    --cc=git@vger.kernel.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. 
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.