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

Re: "git subtree --squash" interacts poorly with revert, merge, and rebase

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 27, 2016, 05:46 UTC
Message-ID
<xmqqtwby8hu8.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<f07745f8-d0ff-c41f-fd44-0812757fbd43@bigpond.net.au>
Peter Williams <pwil3058@bigpond.net.au> writes:
Show 5 quoted lines
> However, for git commands such as diff/status whose job is to display
> information it would be nice if they had a --recursive option to
> override the default submodule diff/status and show details of the
> changes in the submodules.  Sometimes you want to see the big picture
> in detail.
I won't disagree. My comment was only on this part from the original:
>> - We have to make separate commits and manage corresponding topic
>> branches for the superproject and subprojects.
and on this point, we seem to be in agreement.
Previous: Peter WilliamsNext: Junio C Hamano
Message 5 of 11 in “"git subtree --squash" interacts poorly with revert, merge, and rebase”
  1. Matt McCutchenOct 26, 2016
  2. Stefan BellerOct 26, 2016
  3. Junio C HamanoOct 26, 2016
  4. Peter WilliamsOct 27, 2016
  5. Junio C HamanoOct 27, 2016
  6. Junio C HamanoOct 27, 2016
  7. Matt McCutchenOct 27, 2016
  8. Stefan BellerOct 27, 2016
  9. Matt McCutchenOct 27, 2016
  10. Matt McCutchenNov 10, 2016
  11. Matt McCutchenNov 14, 2016

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.