From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 24 Oct 2015 16:42:55 GMT
Subject: Re: ancestor and descendant ~ clarification needed
Message-ID: <xmqqy4esmd4g.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CAAF+z6Guy4h8XDHkgkAmxLftfTTsXrDAd_ezFCQzdiWncvVSTg@mail.gmail.com>

Xue Fuqiao <xfq.free@gmail.com> writes:

> On Sat, Oct 24, 2015 at 12:56 AM, Junio C Hamano <gitster@pobox.com> wrote:
>>> I see.  Thank you.  What do you think about the following minor patch
>>> for user-manual.txt?
>>
>> While the updated text is more correct than the original, I do not
>> know if that is sufficient, or we would also want to mention the
>> "Already up-to-date!" case here while at it.
>
> I thought about that, and IMHO it's not needed.  The section name is
> "Fast-forward merges" and intends to introduce the "fast-forward"
> concept, which is irrelevant to "Already up-to-date!".

Okay.