Re: [PATCH 3/7] sequencer: handle single-commit pick as special case

From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Nov 15, 2011, 08:47 UTC
Message-ID: <CALkWK0krTY+szqPrE9wxwfK76VBbFXh_Xaz8EyWZayLa_SFQTw@mail.gmail.com>
In-Reply-To: <7vpqgvmwtl.fsf@alter.siamese.dyndns.org>

Hi Junio,

Junio C Hamano writes:

> Ramkumar Ramachandra <artagnon@gmail.com> writes:
>> [...]
> [...]
> I do not see an inconsistency here, let alone any "glaring" one.

Yeah, my commit message is totally misleading and unclear.  Yes, all
the operations make sense to you and me; for a new user who doesn't
understand how Git works, it's completely inconsistent at a very
superficial level, no?  The sequence of operations he has to execute
depends on:
1. If he literally specified a single commit or a commit range on the
command-line.
2. In the case of multi-commit picking, there's an additional layer of
decision making: did the conflict occur in the last commit in the
range?

Anyway, I'll rewrite this commit message in the next iteration.

Thanks.

-- Ram