Xue Fuqiao writes:
> On Sat, Oct 24, 2015 at 12:56 AM, Junio C Hamano 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
On Sat, Oct 24, 2015 at 12:56 AM, Junio C Hamano 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
> "Alre
Xue Fuqiao writes:
> Hi Junio,
>
> On Fri, Oct 23, 2015 at 4:22 AM, Junio C Hamano wrote:
>
>> Yeah, that is the other way around.
>>
>> (1) If the current branch is a descendant of the other--so every
>> commit present in the other branch is already contained in the
>> current branch
Hi Junio,
On Fri, Oct 23, 2015 at 4:22 AM, Junio C Hamano wrote:
> Yeah, that is the other way around.
>
> (1) If the current branch is a descendant of the other--so every
> commit present in the other branch is already contained in the
> current branch--then merging the other branch
Xue Fuqiao writes:
> In Documentation/user-manual.txt:
>
>In the following, we say that commit X is "reachable" from commit Y
>if commit X is an ancestor of commit Y. Equivalently, you could say
>that Y is a descendant of X, or that there is a chain of parents
>leading from commi
Hello,
I think you're right, branch A is a descendant of master. We could
change the misleading sentence to "However, if the current branch is a
descendant of the other - if its head is a descendant of the other's
head - [...]", to link back to the definition of descendant for
commits.
2015-10-22
Hi,
In Documentation/user-manual.txt:
In the following, we say that commit X is "reachable" from commit Y
if commit X is an ancestor of commit Y. Equivalently, you could say
that Y is a descendant of X, or that there is a chain of parents
leading from commit Y to commit X.
[...]
H
7 matches
Mail list logo
