From: "David M. Lloyd" <david.lloyd@redhat.com>
To: git@vger.kernel.org
Cc: Fabian Ruch <bafain@gmail.com>
Subject: Re: [PATCH v1] rebase -m: Use empty tree base for parentless commits
Date: Thu, 09 Oct 2014 14:20:36 -0500 [thread overview]
Message-ID: <5436E004.20103@redhat.com> (raw)
In-Reply-To: <bf0e177fbaac91f8c55526729e580fade9f0f395.1412879523.git.bafain@gmail.com>
On 10/09/2014 01:50 PM, Fabian Ruch wrote:
> Hi David,
>
> I don't think you made a mistake at all. If I understand the --merge
> mode of git-rebase correctly there is no need to require a parent.
> The error occurs when the script tries to determine the changes your
> merge commit introduces, which includes the whole "importing/master"
> branch. The strategy is not yet part of the picture then and will not
> be until the changes are being replayed.
Thank you for your prompt response, clear explanation, and patch even!
I'm afraid my understanding of the git internals is next-to-nil. But
I'm glad I could contribute to helping to improve it in some small way.
--
- DML
prev parent reply other threads:[~2014-10-09 19:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-07 18:30 Apparent bug in git rebase with a merge commit David M. Lloyd
2014-10-09 18:50 ` [PATCH v1] rebase -m: Use empty tree base for parentless commits Fabian Ruch
2014-10-09 19:05 ` Junio C Hamano
2014-10-09 19:55 ` Fabian Ruch
2014-10-09 20:18 ` Junio C Hamano
2014-10-13 18:43 ` Fabian Ruch
2014-10-09 19:06 ` Derek Moore
2014-10-09 19:20 ` David M. Lloyd [this message]
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=5436E004.20103@redhat.com \
--to=david.lloyd@redhat.com \
--cc=bafain@gmail.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.