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

Also seeing the "problem with cherry-picking a commit which comes before introducing a new submodule"

From
Joshua Jensen <jjensen@workspacewhiz.com>
Date
Feb 3, 2011, 04:08 UTC
Message-ID
<4D4A2A45.3060804@workspacewhiz.com>

Described in this thread, http://lists.zerezo.com/git/msg737184.html, and this thread, http://lists.zerezo.com/git/msg705275.html, is a problem similar to what I've been seeing today. It seems I can resolve the "conflicting" submodule(s) and continue on, but it is a bit painful as there are a small number of them. I also tried an interactive rebase and assigning a 'pick' entry with the commit I'd like to cherry-pick, and the same problem manifests.

In any case, it seems Jonathan Nieder has potentially identified the problem at http://lists.zerezo.com/git/msg737401.html.

Has a patch come through that addresses this? If one did, did it make it into 1.7.4?

Thanks!
Josh
Message 1 of 1 in “Also seeing the "problem with cherry-picking a commit which comes before introducing a new submodule"”
  1. Joshua JensenFeb 3, 2011

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.