From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: bad git pull Date: Sat, 17 Dec 2005 23:15:06 -0800 Message-ID: <7vd5juub9h.fsf@assigned-by-dhcp.cox.net> References: <68948ca0512151537v2d8f22c8x962c55bd507af8cf@mail.gmail.com> <7vzmn2kjw1.fsf@assigned-by-dhcp.cox.net> <7vu0d9lxx9.fsf@assigned-by-dhcp.cox.net> <118833cc0512161007k38fdd15w2dcdf0c93f26d29e@mail.gmail.com> <7vfyoshmp6.fsf@assigned-by-dhcp.cox.net> <118833cc0512161637v1d180f9fh66a7dc6d3fe11d2b@mail.gmail.com> <7vy82kbiho.fsf@assigned-by-dhcp.cox.net> <7v4q582htm.fsf@assigned-by-dhcp.cox.net> <7v8xujyuna.fsf@assigned-by-dhcp.cox.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Dec 18 08:15:49 2005 Return-path: Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EnslL-0001Uc-D9 for gcvg-git@gmane.org; Sun, 18 Dec 2005 08:15:19 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932689AbVLRHPK (ORCPT ); Sun, 18 Dec 2005 02:15:10 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932691AbVLRHPK (ORCPT ); Sun, 18 Dec 2005 02:15:10 -0500 Received: from fed1rmmtao03.cox.net ([68.230.241.36]:55186 "EHLO fed1rmmtao03.cox.net") by vger.kernel.org with ESMTP id S932689AbVLRHPI (ORCPT ); Sun, 18 Dec 2005 02:15:08 -0500 Received: from assigned-by-dhcp.cox.net ([68.4.9.127]) by fed1rmmtao03.cox.net (InterMail vM.6.01.05.02 201-2131-123-102-20050715) with ESMTP id <20051218071418.LOCU20875.fed1rmmtao03.cox.net@assigned-by-dhcp.cox.net>; Sun, 18 Dec 2005 02:14:18 -0500 To: Nicolas Pitre In-Reply-To: (Nicolas Pitre's message of "Sat, 17 Dec 2005 23:17:20 -0500 (EST)") 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: Nicolas Pitre writes: >> I do not see much difference either way, > > ORIG suggests "origin" to me,... Hmph. I always thought it was original-head before the operation happened, which is why I said it is no different from previous-head.