From: "Sébastien Barthélemy" <barthelemy@crans.org>
To: git@vger.kernel.org
Subject: Re: rebase converts merge commits
Date: Tue, 12 Oct 2010 17:23:18 +0200 [thread overview]
Message-ID: <AANLkTinZzBGtC9q7J=xD1e7c80O4THdP00+mp==8hbQA@mail.gmail.com> (raw)
In-Reply-To: <20101012145824.GF22067@login.drsnuggles.stderr.nl>
Hi Matthijs,
2010/10/12 Matthijs Kooijman <matthijs@stdin.nl>:
> Have you tried the --preserve-merges option to rebase?
No, I didn't know about this option. Thank you for the tip.
I just tried, and it does not work either. The merge commit is
preserved, but the commit I'm push back in time is lost.
There is a warning against this kind behaviour when using both
--interactive and rebase.
Thanks,
--
Sebastian
next prev parent reply other threads:[~2010-10-12 15:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-12 14:55 rebase converts merge commits Sébastien Barthélemy
2010-10-12 14:58 ` Matthijs Kooijman
2010-10-12 15:23 ` Sébastien Barthélemy [this message]
2010-10-12 20:27 ` Kevin Ballard
2010-10-17 8:04 ` Sébastien Barthélemy
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='AANLkTinZzBGtC9q7J=xD1e7c80O4THdP00+mp==8hbQA@mail.gmail.com' \
--to=barthelemy@crans.org \
--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 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).