From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Sverre Hvammen Johansen" Subject: Re: Merging using only fast-forward Date: Sat, 19 Jan 2008 04:39:20 -0800 Message-ID: <402c10cd0801190439j7e5ad661me2ba4007bbe2e882@mail.gmail.com> References: <863asxivlj.fsf@blue.stonehenge.com> <7vwsq9o6ls.fsf@gitster.siamese.dyndns.org> <402c10cd0801162253n6ab19f51y53d0baa16319adaa@mail.gmail.com> <402c10cd0801172258p9a1a97bt682fa012fcebd13c@mail.gmail.com> <7vodbibzch.fsf@gitster.siamese.dyndns.org> <402c10cd0801190228o68995493u9b8b40e1557092dd@mail.gmail.com> <7vzlv2858y.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Jan 19 13:39:54 2008 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 1JGCzJ-0005e0-Jt for gcvg-git-2@gmane.org; Sat, 19 Jan 2008 13:39:54 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753201AbYASMjX (ORCPT ); Sat, 19 Jan 2008 07:39:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751689AbYASMjX (ORCPT ); Sat, 19 Jan 2008 07:39:23 -0500 Received: from fg-out-1718.google.com ([72.14.220.156]:46473 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751898AbYASMjW (ORCPT ); Sat, 19 Jan 2008 07:39:22 -0500 Received: by fg-out-1718.google.com with SMTP id e21so1311879fga.17 for ; Sat, 19 Jan 2008 04:39:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; bh=rAU6F/GaRuq0H6lR+r8lD+wgLTkacy4KM/wajZcJl2U=; b=xDSPlOuLrYKuTFKuqrwUb6YVBFKqLyR0EuEip5v5Luw7DuYEIi/zOIqQs4y7lgRa/t7Xl1IjhLFmrwR/m1LR7qmOHgbhP2nWU3Fml/+p3krLPh9mSwN123sS0HJtwlWYEbzl+15e7PJeh2B0l0+8CGiQcBtjZERyOd/YhpVQDJ8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=SBPHcTmTB/B2v4mApkntGGRNQTtm7ZdbHLUZ5so/rtckzyFQpJINQZkxz3au9m9q563zeewRZcSfO6MP4tnE61+8v60J8qGv6lm5w0KJLUa5DkSGcKB3iXUMIE7dOiYrYNeB3W4KWU0/wb3Q6ktwKgOQgJruse6URqbbIpNyQ08= Received: by 10.82.159.15 with SMTP id h15mr8133495bue.36.1200746360829; Sat, 19 Jan 2008 04:39:20 -0800 (PST) Received: by 10.82.172.18 with HTTP; Sat, 19 Jan 2008 04:39:20 -0800 (PST) In-Reply-To: <7vzlv2858y.fsf@gitster.siamese.dyndns.org> Content-Disposition: inline Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Jan 19, 2008 2:43 AM, Junio C Hamano wrote: > At one end of the spectrum, we have these crazy people who want > git to record something that is not a merge at all as a merge > with --no-ff. At the other end of the spectrum, we have these > other crazy people who want git to outsmart them by allowing > them to throw random set of commits as potential parents, > remove duplicates and figure out how many real parents the > resulting merge should have (including the case that it may not > even have any). I guess the most common use case would be where you have at least three developers and they randomly fetch and merge between each other. They usually are not aware of where each other are and everyone avoids octopus. They end up with more merge commits than needed simply because they sometime pick the wrong order. If they instead had git find the real parents they would get fewer merge commits. -- Sverre Hvammen Johansen