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

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 27, 2016, 06:00 UTC
Message-ID: <xmqqpomm8h6v.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <xmqqtwby8hu8.fsf@gitster.mtv.corp.google.com>

Junio C Hamano <gitster@pobox.com> writes:

Show 14 quoted lines

> Peter Williams <pwil3058@bigpond.net.au> writes:
>
>> 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.

Oh, and as Stefan mentioned, a "git diff" that recurses into the submodules to give you detailed big picture has been in 'next' (perhaps aready in 'master' as of tonight, but I am not sure offhand) to be tested, together with many other fixes and enhancements that all are waiting to be included in future releases.

The more people try and give feedback to these branches early, the more solid release with better support for more goodies you'd want we will be able to give you. Early adopters are always appreciated but especially in time like this before the feature freeze for the upcoming release (see tinyurl.com/gitCal for the schedule), they are of great help.

Start by cloning from any one of these places

  git://git.kernel.org/pub/scm/git/git.git/
  https://kernel.googlesource.com/pub/scm/git/git
  git://repo.or.cz/alt-git.git/
  https://github.com/git/git/

and then

  $ git checkout -b next origin/next
  : read INSTALL to figure out if any custom options are needed
  : in the following 'make' invocations for your environment
  $ make && make install
  $ PATH=$HOME/bin:$PATH

to join the fun.