git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v1] rebase -m: Use empty tree base for parentless commits

From
David M. Lloyd <david.lloyd@redhat.com>
Date
Oct 9, 2014, 19:20 UTC
Message-ID
<5436E004.20103@redhat.com>
In-Reply-To
<bf0e177fbaac91f8c55526729e580fade9f0f395.1412879523.git.bafain@gmail.com>
On 10/09/2014 01:50 PM, Fabian Ruch wrote:
Show 8 quoted lines
> 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
Previous: Derek Moore
Message 8 of 8 in “Apparent bug in git rebase with a merge commit”
  1. David M. LloydOct 7, 2014
  2. rebase -m: Use empty tree base for parentless commitsFabian Ruch, Oct 9, 2014
  3. Junio C HamanoOct 9, 2014
  4. Fabian RuchOct 9, 2014
  5. Junio C HamanoOct 9, 2014
  6. Fabian RuchOct 13, 2014
  7. Derek MooreOct 9, 2014
  8. David M. LloydOct 9, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.