From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthieu Moy Subject: Re: [PATCH/RFC v2 2/2] git-am: add am.threeWay config variable Date: Tue, 02 Jun 2015 15:37:27 +0200 Message-ID: References: <1433251472-29460-1-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr> <1433251472-29460-2-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr> Mime-Version: 1.0 Content-Type: text/plain Cc: git@vger.kernel.org, Remi Galan , Guillaume Pages , Louis-Alexandre Stuber , Antoine Delaite To: Remi Lespinet X-From: git-owner@vger.kernel.org Tue Jun 02 15:38:13 2015 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 1YzmNs-000287-6B for gcvg-git-2@plane.gmane.org; Tue, 02 Jun 2015 15:37:36 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758907AbbFBNhc (ORCPT ); Tue, 2 Jun 2015 09:37:32 -0400 Received: from mx2.imag.fr ([129.88.30.17]:37416 "EHLO rominette.imag.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753009AbbFBNhb (ORCPT ); Tue, 2 Jun 2015 09:37:31 -0400 Received: from clopinette.imag.fr (clopinette.imag.fr [129.88.34.215]) by rominette.imag.fr (8.13.8/8.13.8) with ESMTP id t52DbQqj020275 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 2 Jun 2015 15:37:26 +0200 Received: from anie.imag.fr (anie.imag.fr [129.88.7.32]) by clopinette.imag.fr (8.13.8/8.13.8) with ESMTP id t52DbRuw012427; Tue, 2 Jun 2015 15:37:27 +0200 In-Reply-To: <1433251472-29460-2-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr> (Remi Lespinet's message of "Tue, 2 Jun 2015 15:24:32 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.2 (rominette.imag.fr [129.88.30.17]); Tue, 02 Jun 2015 15:37:26 +0200 (CEST) X-IMAG-MailScanner-Information: Please contact MI2S MIM for more information X-MailScanner-ID: t52DbQqj020275 X-IMAG-MailScanner: Found to be clean X-IMAG-MailScanner-SpamCheck: X-IMAG-MailScanner-From: matthieu.moy@grenoble-inp.fr MailScanner-NULL-Check: 1433857046.73439@TuDgJ9Yyi2g7xB6nv9hilQ Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Remi Lespinet writes: > +if test "$(git config --bool --get am.threeWay)" = true > +then > + threeway=t > +fi I think you missed Paul's remark on this: http://article.gmane.org/gmane.comp.version-control.git/270150 Not terribly important since am will be rewritten soon, though. -- Matthieu Moy http://www-verimag.imag.fr/~moy/