From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Contreras Subject: Re: first parent, commit graph layout, and pull merge direction Date: Thu, 23 May 2013 19:25:53 -0500 Message-ID: References: <20130522115042.GA20649@inner.h.apk.li> <7v4ndukhx0.fsf@alter.siamese.dyndns.org> <20130523090657.GB23933@inner.h.apk.li> <20130523102959.GP9448@inner.h.apk.li> <20130523110839.GT27005@serenity.lan> <7vd2shheic.fsf@alter.siamese.dyndns.org> <20130523164114.GV27005@serenity.lan> <7vbo81e7gs.fsf@alter.siamese.dyndns.org> <20130523215557.GX27005@serenity.lan> <7vli75cpom.fsf@alter.siamese.dyndns.org> <7vppwhb52f.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Cc: Linus Torvalds , John Keeping , Andreas Krey , John Szakmeister , Git Mailing List To: Junio C Hamano X-From: git-owner@vger.kernel.org Fri May 24 02:26:06 2013 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 1UffpX-0000U0-Bh for gcvg-git-2@plane.gmane.org; Fri, 24 May 2013 02:25:59 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758113Ab3EXAZz (ORCPT ); Thu, 23 May 2013 20:25:55 -0400 Received: from mail-la0-f41.google.com ([209.85.215.41]:39682 "EHLO mail-la0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757810Ab3EXAZz (ORCPT ); Thu, 23 May 2013 20:25:55 -0400 Received: by mail-la0-f41.google.com with SMTP id ee20so3899349lab.28 for ; Thu, 23 May 2013 17:25:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=/Ue49pTU+BRjHFqvFm/biCG0ahc0kY9ztlwoHomIk58=; b=GbN7cjsOZTcuOfBEF3nX4LtjV+buwPAgoBH6tN2yV/DaEZDJyGUw9Q4ppq40FGH8gz OKqRSo4EEpualXRkW3VshCpH4Suw46wHAXOfl2IJpLWRzPnF0nRXnDeAhcjCkPheLjFN l0jJXmtxv9TD2b7vJ+8bbsr4VEO+Ic83IVraTltExtnlXGd6XetBFDlhfN7Z+RisU0Sf px8v6SKbo5lQUhMoJwXGggJeLDZ2WQ7j+Wmjy6ZJAQOXgZZKYuI8jholJAPX5fSwGC3T 9pawTECrgmfqvUM8KqNW1mJBdol3nEj34G6Ilm6N5gxubXoV4KjrhOe/JBupQQj/3g73 lLPg== X-Received: by 10.112.63.169 with SMTP id h9mr7613957lbs.135.1369355153355; Thu, 23 May 2013 17:25:53 -0700 (PDT) Received: by 10.114.174.170 with HTTP; Thu, 23 May 2013 17:25:53 -0700 (PDT) In-Reply-To: <7vppwhb52f.fsf@alter.siamese.dyndns.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Thu, May 23, 2013 at 7:21 PM, Junio C Hamano wrote: > Linus Torvalds writes: > >> It would be a *horrible* mistake to make "rebase" the default, because >> it's so much easier to screw things up that way. >> >> That said, making "no-ff" the default, and then if that fails, saying >> >> The pull was not a fast-forward pull, please say if you want to >> merge or rebase. >> Use either >> >> git pull --rebase >> git pull --merge >> >> You can also use "git config pull.merge true" or "git config >> pull.rebase true" >> to set this once for this project and forget about it. >> >> That way, people who want the existing behavior could just do that >> >> git config pull.merge true >> >> once, and they'd not even notice. >> >> Hmm? Better yet, make it per-branch. > > I would assume that "no-ff" above was meant to be "--ff-only" from > the first part of the message. > > I also would assume that I can rephrase that setting pull.merge > (which does not exist) as setting pull.rebase explicitly to false > instead (i.e. missing pull.rebase and pull.rebase that is explicitly > set to false would mean two different things). > > I have to think about this a bit to convince myself that the message > is clear enough and useful for those this updated behaviour is > trying to help. After reading the above message three times, I > still cannot shake the impression that we are just covering our > backside to be able to say "we told you already and you chose > poorly", in case things go wrong for them later. FWIW this is the message Mercurial users get (and they often say Mercurial's UI makes more sense): pushing to /tmp/foo searching for changes abort: push creates new remote head 77eafc4313d5! (you should pull and merge or use push -f to force) -- Felipe Contreras