Re: Submodule/contents conflict

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 27, 2017, 00:29 UTC
Message-ID: <xmqqinlqr8vm.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CAGZ79kZEveo8jQodvd0n6fEXc1OXDVa26BCumM0etjst74F_Hw@mail.gmail.com>

Stefan Beller <sbeller@google.com> writes:

Show 8 quoted lines

>> +'git checkout' --working-tree-only <tree-ish> [--] <pathspec>...::
>> +       Similar to `git checkout <tree-ish> [--] <pathspec>`, but
>> +       the index file is left in the same state as it was before
>> +       running this command.
>
> Adding this as a new mode seems like a "patch after the fact",
> whereas the wording hints that this may be included in the prior
> part, but I find it hard to come up with a good description there.

Yes, having three distinct modes of operation covered in a single entry makes the description unnecessarily messy, as you have to say "generally these things happen, but if you use X then additionally this happens before that, and if you do not use Y then this happens instead". We _might_ want to separate the [-p|--patch] mode out of the main one, making these into three entries, for this reason.