Currently using "git rm" on a submodule - populated or not - fails with
this error:
fatal: git rm: '': Is a directory
This made sense in the past as there was no way to remove a submodule
without possibly removing unpushed parts of the submodule's history
contained in its .git directory too
Jens Lehmann 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
> +
Am 27.09.2012 18:53, schrieb Junio C Hamano:
> Jens Lehmann writes:
>> +/*
>> + * Skip unmerged entries except for populated submodules
>> + * that could loose history when removed.
>> + */
>
> s/loose/lose/, I think.
3 matches
Mail list logo