Re: still getting 'It is a submodule!" in 1.6.2.5

From: Matthias Andree <matthias.andree@gmx.de>
Date: May 6, 2009, 07:31 UTC
Message-ID: <op.uthy6h131e62zd@merlin.emma.line.org>
In-Reply-To: <7vy6tc2gnt.fsf@alter.siamese.dyndns.org>

Am 05.05.2009, 08:43 Uhr, schrieb Junio C Hamano <gitster@pobox.com>:

Show 22 quoted lines

> Tim Olsen <tim@brooklynpenguin.com> writes:
>
>> Clemens replied with a patch [2], but I don't think it got into git's  
>> git.
>>
>> Junio replied with two versions of a patch [3, 4], of which one of them
>> appears to have made it into git's git as commit
>> 7dae8b21c2fe39a59661c709f0dc17090dafa5a4
>>
>> 1.6.2.5 was then released yesterday which has commit
>> 7dae8b21c2fe39a59661c709f0dc17090dafa5a4.
>
> But that is not the one you want.  7dae8b2 (diff -c -p: do not die on
> submodules, 2009-04-29) is to allow viewing of such a merge correctly; To
> make the merge automatically, you'd need 0c44c94 (merge-recursive: do not
> die on a conflicting submodule, 2009-04-29), which is on 'master', but  
> not
> on 1.6.2.X (and likely will never be).
>
> Could you be running 1.6.3-rcX instead of 1.6.2.X?  In general, the tip  
> of
> the 'master' is always as stable as any released version, if not more.

Is there an easy-to-find and easy-to-grasp table that lists which branches are recommended for which target group? If there is, I have constantly missed it.

May I suggest that there be a remark on the download page of git-scm.com that "master" is really the recommended branch?

-- 
Matthias Andree