From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marc Branchaud Subject: Re: Pull is Evil Date: Wed, 30 Apr 2014 18:06:45 -0400 Message-ID: <536173F5.7010905@xiplink.com> References: <4ay6w9i74cygt6ii1b0db7wg.1398433713382@email.android.com> <536106EA.5090204@xiplink.com> <536152D3.5050107@xiplink.com> <5361598f8eaf7_4781124b2f02b@nysa.notmuch> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: Marat Radchenko , git@vger.kernel.org To: Felipe Contreras , Junio C Hamano X-From: git-owner@vger.kernel.org Thu May 01 00:06:41 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WfceF-0007sG-On for gcvg-git-2@plane.gmane.org; Thu, 01 May 2014 00:06:40 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964977AbaD3WGV (ORCPT ); Wed, 30 Apr 2014 18:06:21 -0400 Received: from smtp130.ord.emailsrvr.com ([173.203.6.130]:53132 "EHLO smtp130.ord.emailsrvr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933602AbaD3WGU (ORCPT ); Wed, 30 Apr 2014 18:06:20 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp25.relay.ord1a.emailsrvr.com (SMTP Server) with ESMTP id 561353F0AA2; Wed, 30 Apr 2014 18:06:19 -0400 (EDT) X-Virus-Scanned: OK Received: by smtp25.relay.ord1a.emailsrvr.com (Authenticated sender: mbranchaud-AT-xiplink.com) with ESMTPSA id 0D04A3F0156; Wed, 30 Apr 2014 18:06:19 -0400 (EDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 In-Reply-To: <5361598f8eaf7_4781124b2f02b@nysa.notmuch> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On 14-04-30 04:14 PM, Felipe Contreras wrote: > Marc Branchaud wrote: >> All that said, I don't object to any attempts at improving the command >> either. But I also don't see any kind of improvement that would lead >> me to start using "git pull" let alone recommending it to new users. > > What is wrong when `git pull` merges a fast-forward? Nothing. Everything. It depends. > The problems with `git pull` come when you can't do a fast-forward merge, right? Some of them, maybe most of them. But the reason "git pull" is broken is that any solution to the problems that arise depend on the project's workflow. That would be fine if there was a workflow that suited some large majority of users, but there doesn't seem to be one. M. [1] https://www.survs.com/results/QPESOB10/ME8UTHXM4M