From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bruce Stephens Subject: Re: [RFC/PATCH] Fast forward strategies allow, never, and only Date: Tue, 11 Mar 2008 12:33:38 +0000 Message-ID: <80lk4po2xp.fsf@tiny.isode.net> References: <20080311093553.23191.qmail@science.horizon.com> <80r6eho3cs.fsf@tiny.isode.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Mar 11 13:34:33 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 1JZ3gc-0006BA-Mx for gcvg-git-2@gmane.org; Tue, 11 Mar 2008 13:34:31 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753743AbYCKMdl (ORCPT ); Tue, 11 Mar 2008 08:33:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753769AbYCKMdl (ORCPT ); Tue, 11 Mar 2008 08:33:41 -0400 Received: from rufus.isode.com ([62.3.217.251]:60371 "EHLO rufus.isode.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753715AbYCKMdk (ORCPT ); Tue, 11 Mar 2008 08:33:40 -0400 Received: from tiny.isode.net (shiny.isode.com [62.3.217.250]) by rufus.isode.com (smtp internal) via TCP with SMTP id for ; Tue, 11 Mar 2008 12:33:38 +0000 Received: by tiny.isode.net (sSMTP sendmail emulation); Tue, 11 Mar 2008 12:33:38 +0000 X-Hashcash: 1:20:080311:git@vger.kernel.org::isOc5Xjn0NtSspPK:0000000000000000000000000000000000000000009P0j In-Reply-To: <80r6eho3cs.fsf@tiny.isode.net> (Bruce Stephens's message of "Tue\, 11 Mar 2008 12\:24\:35 +0000") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Bruce Stephens writes: > colin@horizon.com writes: [...] > IIUC what the new option is about is (optionally) forbidding merges. > So it's orthogonal to the existing --no-ff and --ff merge options. I'm wrong. My apologies. [...]