From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jon Loeliger Subject: Please undo "Use git-merge instead of git-resolve in git-pull" Date: Thu, 22 Sep 2005 11:31:34 -0500 Message-ID: X-From: git-owner@vger.kernel.org Thu Sep 22 18:32:27 2005 Return-path: Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EITz5-0007dr-Eu for gcvg-git@gmane.org; Thu, 22 Sep 2005 18:31:45 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030435AbVIVQbl (ORCPT ); Thu, 22 Sep 2005 12:31:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030436AbVIVQbl (ORCPT ); Thu, 22 Sep 2005 12:31:41 -0400 Received: from www.jdl.com ([66.118.10.122]:40619 "EHLO jdl.com") by vger.kernel.org with ESMTP id S1030435AbVIVQbk (ORCPT ); Thu, 22 Sep 2005 12:31:40 -0400 Received: from jdl (helo=jdl.com) by jdl.com with local-esmtp (Exim 4.44) id 1EITyw-0002un-JX for git@vger.kernel.org; Thu, 22 Sep 2005 11:31:35 -0500 To: git@vger.kernel.org In-Reply-To: Pine.LNX.4.58.0509220826460.2553@g5.osdl.org X-Spam-Score: -105.9 (---------------------------------------------------) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: So, like, the other day Linus Torvalds mumbled: > Still with me? Grasshopper still trying to keep up. You and Petr have given me much to think about and try. Give me a moment of tree-building to grasp the pebble... jdl