From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Sep 2012 16:53:33 GMT
Subject: Re: [PATCH v4] Teach rm to remove submodules unless they contain a git directory
Message-ID: <7v8vbvs8z6.fsf@alter.siamese.dyndns.org>
In-Reply-To: <50634799.7090807@web.de>

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.