From: "Uwe Kleine-König" <Uwe.Kleine-Koenig@digi.com>
To: git@vger.kernel.org
Subject: problem with git rebase -i
Date: Mon, 11 Feb 2008 14:44:48 +0100 [thread overview]
Message-ID: <20080211134448.GA17588@digi.com> (raw)
Hello,
I tried to rebase my work (on the Linux kernel) to current Linus'
master. As I have two branches I merged them and ran:
git rebase -i -p v2.6.25-rc1
But then the list I got in my editor didn't include the merge and so the
result was broken.
If I add
pick 913183f
(with 913183f being my HEAD) to the list, the result is correct.
The reason that my merge is missing is that git rev-list thinks my
merge is the same as 249d621 and so skips that as it uses --cherry-pick.
Currently I cannot reproduce that with a simple testcase.
I don't want to publish my tree now, but I can provide a bundle if
someone wants to look into that.
Best regards
Uwe
--
Uwe Kleine-König, Software Engineer
Digi International GmbH Branch Breisach, Küferstrasse 8, 79206 Breisach, Germany
Tax: 315/5781/0242 / VAT: DE153662976 / Reg. Amtsgericht Dortmund HRB 13962
next reply other threads:[~2008-02-11 13:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-11 13:44 Uwe Kleine-König [this message]
2008-02-13 8:10 ` problem with git rebase -i Uwe Kleine-König
2008-02-13 9:29 ` Uwe Kleine-König
2008-02-13 10:10 ` [PATCH] new test: rev-list --cherry-pick excludes an empty commit against a superseding merge Uwe Kleine-König
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=20080211134448.GA17588@digi.com \
--to=uwe.kleine-koenig@digi.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 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).