From: Joshua Jensen <jjensen@workspacewhiz.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Dominique Quatravaux <domq@google.com>, git@vger.kernel.org
Subject: Re: git rebase and merge commits
Date: Wed, 20 Oct 2010 12:12:24 -0600 [thread overview]
Message-ID: <4CBF3108.4070300@workspacewhiz.com> (raw)
In-Reply-To: <4CBF2A94.1030206@workspacewhiz.com>
----- Original Message -----
From: Joshua Jensen
Date: 10/20/2010 11:44 AM
> ----- Original Message -----
> From: Jonathan Nieder
> Date: 10/20/2010 11:32 AM
>> 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
> I applied that patch to my git-rebase--interactive, although it did
> not cleanly apply. I hacked a few bits to get it going again. I
> could post the entire file here, if someone wants to clean it up.
>
> It does properly rebase the first-parent merges fine.
Never mind. I applied this patch:
http://marc.info/?l=git&m=119379735525213&w=2
Josh
next prev parent reply other threads:[~2010-10-20 18:12 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
2010-10-20 17:44 ` Joshua Jensen
2010-10-20 18:12 ` Joshua Jensen [this message]
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=4CBF3108.4070300@workspacewhiz.com \
--to=jjensen@workspacewhiz.com \
--cc=domq@google.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@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 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.