Re: Last mile for 1.0

From: Linus Torvalds <torvalds@osdl.org>
Date: Jun 6, 2005, 00:02 UTC
Message-ID: <Pine.LNX.4.58.0506051658100.1876@ppc970.osdl.org>
In-Reply-To: <7vk6l8xue5.fsf_-_@assigned-by-dhcp.cox.net>

On Sun, 5 Jun 2005, Junio C Hamano wrote:

> 
>  - Tutorials you have been working on.  I'd appreciate it if my
>    earlier "what about cvs annotate" example *3* finds its home
>    somewhere in that document ;-).

My main dislike about that was that I don't think -S is "better" than annotate as you claim - I think it's different and can be better in many circumstances, but I don't like the notion of telling a new user "you don't want annotate, pickaxe is better".

Let's just be upfront about some things being missing, and suggest alternatives. A lot of times, just "git-whatchanged -p filename" ends up being sufficient, at other times -S might be.

Finally, please send it as a patch, that way the authorship etc stuff gets done right.

>  - "What happens when a merge goes wrong" helper script Jeff
>    wanted to have in *4*.

Does anybody have any suggestions? Preferably with a reasonable test-case, so that people can try it out.. Maybe just leaving the merge failures where they are?

		Linus