Re: [PATCH v4 1/4] worktree remove: refuse a worktree in the middle of an operation

[Ben Knoble <ben.knoble@gmail.com>]

> 
> Le 10 nov. 2026 à 11:47, Phillip Wood <phillip.wood123@gmail.com> a écrit :
> 
> Hi Jasper
> 
>> On 02/11/2026 18:29, Jasper Mayone wrote:
>> diff --git a/Documentation/git-worktree.adoc b/Documentation/git-worktree.adoc
>> index e6e77252ab..4a7dc47dd8 100644
>> --- a/Documentation/git-worktree.adoc
>> +++ b/Documentation/git-worktree.adoc
>> @@ -141,10 +141,16 @@ the new working tree location.
>>    `remove`::
>>  -Remove a worktree. Only clean worktrees (no untracked files and no
>> -modification in tracked files) can be removed. Unclean worktrees or ones
>> -with submodules can be removed with `--force`. The main worktree cannot be
>> -removed.
>> +Remove a worktree. The main worktree cannot be removed. Without
>> +`--force`, a worktree is not removed when:
>> ++
>> +--
>> +* it has untracked files or modifications in tracked files,
>> +* it has submodules, or
> 
> This is a list so each item should be a self contained sentence, we should drop the comma above and ", or" here.
> 
>> +* it is in the middle of a rebase, a `git am` session, a bisect, a
>> +  cherry-pick or a revert, because removing it loses the state of that
>> +  operation.

Well, each item is a clause/phrase… I actually think the “or” fits better than
rewriting the list introduction and items to be complete sentences.

I think that construction is ok as-is.