From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Poole Subject: Re: If you would write git from scratch now, what would you change? Date: Mon, 26 Nov 2007 14:50:35 -0500 Message-ID: <87ve7ozsz8.fsf@graviton.dyn.troilus.org> References: <200711252248.27904.jnareb@gmail.com> <2A34D324-48A4-49EF-9D4E-5B9469A0791D@lrde.epita.fr> <20071126185600.GA25784@efreet.light.src> <85prxw253u.fsf@lola.goethe.zz> <20071126193455.GC25784@efreet.light.src> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: David Kastrup , Benoit Sigoure , Andy Parkins , git@vger.kernel.org To: Jan Hudec X-From: git-owner@vger.kernel.org Mon Nov 26 20:51:11 2007 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1Iwjyp-0003Ka-OT for gcvg-git-2@gmane.org; Mon, 26 Nov 2007 20:50:56 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753607AbXKZTug (ORCPT ); Mon, 26 Nov 2007 14:50:36 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753570AbXKZTug (ORCPT ); Mon, 26 Nov 2007 14:50:36 -0500 Received: from 24-75-174-210-st.chvlva.adelphia.net ([24.75.174.210]:32872 "EHLO sanosuke.troilus.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753204AbXKZTug (ORCPT ); Mon, 26 Nov 2007 14:50:36 -0500 Received: by sanosuke.troilus.org (Postfix, from userid 1000) id E93C789C128; Mon, 26 Nov 2007 14:50:35 -0500 (EST) In-Reply-To: <20071126193455.GC25784@efreet.light.src> (Jan Hudec's message of "Mon\, 26 Nov 2007 20\:34\:55 +0100") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Jan Hudec writes: > The basic pull/push actions are: > > git pull: Bring the remote ref value here. > git push: Put the local ref value there. > > Are those not oposites? > > Than each command has it's different features on top of this -- pull merges > and push can push multiple refs -- but in the basic operation they are > oposites. I think that is in absolute agreement with David: Ducks swim on the surface of the water and lobsters swim underneath. Why consider the different features on top of where they swim? The thing about git-pull that surprises so many users is the merge. There's a separate command to do that step, and git-pull had a fairly good excuse to do the merge before git's 1.5.x remote system was in place, but now the only really defensible reason for its behavior is history. Michael Poole