From: Junio C Hamano <gitster@pobox.com>
To: Peter Williams <pwil3058@bigpond.net.au>
Cc: Stefan Beller <sbeller@google.com>,
Matt McCutchen <matt@mattmccutchen.net>,
git <git@vger.kernel.org>
Subject: Re: "git subtree --squash" interacts poorly with revert, merge, and rebase
Date: Wed, 26 Oct 2016 23:00:24 -0700 [thread overview]
Message-ID: <xmqqpomm8h6v.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqtwby8hu8.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Wed, 26 Oct 2016 22:46:23 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> 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.
next prev parent reply other threads:[~2016-10-27 6:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-26 23:07 "git subtree --squash" interacts poorly with revert, merge, and rebase Matt McCutchen
2016-10-26 23:23 ` Stefan Beller
2016-10-26 23:59 ` Junio C Hamano
2016-10-27 4:23 ` Peter Williams
2016-10-27 5:46 ` Junio C Hamano
2016-10-27 6:00 ` Junio C Hamano [this message]
2016-10-27 1:52 ` Matt McCutchen
2016-10-27 2:03 ` Stefan Beller
2016-10-27 2:42 ` Matt McCutchen
2016-11-10 21:53 ` Matt McCutchen
2016-11-14 22:37 ` Matt McCutchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqpomm8h6v.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=matt@mattmccutchen.net \
--cc=pwil3058@bigpond.net.au \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).