From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: Orgad Shaneh <orgads@gmail.com>,
Dakota Hawkins <dakotahawkins@gmail.com>,
git <git@vger.kernel.org>
Subject: Re: Submodule/contents conflict
Date: Mon, 24 Apr 2017 19:12:08 -0700 [thread overview]
Message-ID: <xmqqfugxxmkn.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CAGZ79kZ5440r1EHOVP3eXxe5u=u16y_jXTA0C4hLJA2kUkF-kg@mail.gmail.com> (Stefan Beller's message of "Mon, 24 Apr 2017 10:40:36 -0700")
Stefan Beller <sbeller@google.com> writes:
> A similar bug report
> https://public-inbox.org/git/CAG0BQX=wvpkJ=PQWV-NbmhuPV8yzvd_KYKzJmsfWq9xStZ2bnQ@mail.gmail.com/
>
> "checkout --recurse-submodules" (as mentioned in that report)
> made it into Git by now, but this bug goes unfixed, still.
I do not mind reverting that merge out of 'master'. Please holler
if you feel these "go recursive" topics are premature.
Thanks.
next prev parent reply other threads:[~2017-04-25 2:12 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-24 8:06 Submodule/contents conflict Orgad Shaneh
2017-04-24 17:40 ` Stefan Beller
2017-04-24 23:33 ` Philip Oakley
2017-04-24 23:43 ` Stefan Beller
2017-04-25 3:22 ` Jeff King
2017-04-25 3:39 ` Jeff King
2017-04-27 22:52 ` Philip Oakley
2017-04-28 8:30 ` Jeff King
2017-05-01 0:15 ` Junio C Hamano
2017-04-25 11:10 ` Philip Oakley
2017-04-26 2:51 ` Junio C Hamano
2017-04-26 17:41 ` Stefan Beller
2017-04-27 0:25 ` Junio C Hamano
2017-04-27 0:29 ` Junio C Hamano
2017-04-27 22:07 ` Philip Oakley
2017-04-28 2:08 ` Junio C Hamano
2017-04-25 2:12 ` Junio C Hamano [this message]
2017-04-25 15:57 ` Stefan Beller
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=xmqqfugxxmkn.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=dakotahawkins@gmail.com \
--cc=git@vger.kernel.org \
--cc=orgads@gmail.com \
--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).