From: Junio C Hamano <gitster@pobox.com>
To: Jens Lehmann <Jens.Lehmann@web.de>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Michał Górny" <mgorny@gentoo.org>,
"Phil Hord" <phil.hord@gmail.com>,
"Heiko Voigt" <hvoigt@hvoigt.net>
Subject: Re: [PATCH v4] Teach rm to remove submodules unless they contain a git directory
Date: Thu, 27 Sep 2012 09:53:33 -0700 [thread overview]
Message-ID: <7v8vbvs8z6.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <50634799.7090807@web.de> (Jens Lehmann's message of "Wed, 26 Sep 2012 20:21:13 +0200")
Jens Lehmann <Jens.Lehmann@web.de> writes:
> Changes since v3:
> - Added get_ours_cache_pos() helper to only check stage 2 of a conflict
> - Added tests for modified submodules in the conflict case
Thanks.
> + /*
> + * Skip unmerged entries except for populated submodules
> + * that could loose history when removed.
> + */
s/loose/lose/, I think.
next prev parent reply other threads:[~2012-09-27 16:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-26 18:21 [PATCH v4] Teach rm to remove submodules unless they contain a git directory Jens Lehmann
2012-09-27 16:53 ` Junio C Hamano [this message]
2012-09-29 14:23 ` Jens Lehmann
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v8vbvs8z6.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=hvoigt@hvoigt.net \
--cc=mgorny@gentoo.org \
--cc=phil.hord@gmail.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.
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 NNTP newsgroup(s).