From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: Newbie falls at first hurdle Date: Sun, 18 Sep 2005 10:54:20 -0700 Message-ID: <7vzmqa2reb.fsf@assigned-by-dhcp.cox.net> References: <200509180135.j8I1Z34n023252@inti.inf.utfsm.cl> <46a038f9050918035436352f71@mail.gmail.com> <200509181347.11403.alan@chandlerfamily.org.uk> <7vek7m5m0z.fsf@assigned-by-dhcp.cox.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Alan Chandler , git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Sep 18 19:55:37 2005 Return-path: Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EH3Mu-00087C-VS for gcvg-git@gmane.org; Sun, 18 Sep 2005 19:54:25 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932143AbVIRRyX (ORCPT ); Sun, 18 Sep 2005 13:54:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932144AbVIRRyX (ORCPT ); Sun, 18 Sep 2005 13:54:23 -0400 Received: from fed1rmmtao06.cox.net ([68.230.241.33]:32468 "EHLO fed1rmmtao06.cox.net") by vger.kernel.org with ESMTP id S932143AbVIRRyW (ORCPT ); Sun, 18 Sep 2005 13:54:22 -0400 Received: from assigned-by-dhcp.cox.net ([68.4.9.127]) by fed1rmmtao06.cox.net (InterMail vM.6.01.05.02 201-2131-123-102-20050715) with ESMTP id <20050918175419.YPQ18416.fed1rmmtao06.cox.net@assigned-by-dhcp.cox.net>; Sun, 18 Sep 2005 13:54:19 -0400 To: Linus Torvalds In-Reply-To: (Linus Torvalds's message of "Sun, 18 Sep 2005 10:40:06 -0700 (PDT)") User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/21.4 (gnu/linux) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Linus Torvalds writes: > In other words, you'd have to explain what "pu^2~3" means. > > And octopus merges, for that matter. I don't think the tutorial ever > explains those. Sorry, my excuses are (1) I just did a quick example from a tree I had handy -- my live tree; (2) as long as the user knows the commit show-branch labeled with the cryptic "pu^2~3" is the one s/he wants, it does not matter much what that label exactly means. But of course you are right.