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

Re: [Bug] rebase -i squashes submodule changes into unrelated commit

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 27, 2009, 09:20 UTC
Message-ID
<7vd4e9yujd.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<7vljsxyv58.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 8 quoted lines
> Attempting to rebase three-commit series (two regular changes, followed by
> one commit that changes what commit is bound for a submodule path) to
> squash the first two results in a failure; not just the first two commits
> squashed, but the change to the submodule is also included in the result.
>
> This failure causes the subsequent step to "pick" the change that actually
> changes the submodule to be applied, because there is no change left to be
> applied.
Sorry, an obvious typo is here: s/to be applied,/to fail,/;
Previous: Junio C HamanoNext: Johannes Schindelin
Message 2 of 3 in “[Bug] rebase -i squashes submodule changes into unrelated commit”
  1. Junio C HamanoJan 27, 2009
  2. Junio C HamanoJan 27, 2009
  3. Fix submodule squashing into unrelated commitJohannes Schindelin, Jan 27, 2009

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.