From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthieu Moy Subject: Re: [PATCH/RFC v3 4/4] git-am: add am.threeWay config variable Date: Wed, 03 Jun 2015 18:31:18 +0200 Message-ID: References: <1433266446-2845-1-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr> <1433266446-2845-4-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 Wed Jun 03 18:31:33 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 1Z0BZe-0002Xy-Hi for gcvg-git-2@plane.gmane.org; Wed, 03 Jun 2015 18:31:26 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753976AbbFCQbW (ORCPT ); Wed, 3 Jun 2015 12:31:22 -0400 Received: from mx2.imag.fr ([129.88.30.17]:44354 "EHLO rominette.imag.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752991AbbFCQbV (ORCPT ); Wed, 3 Jun 2015 12:31:21 -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 t53GVFgd002065 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 3 Jun 2015 18:31:16 +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 t53GVIlo010260; Wed, 3 Jun 2015 18:31:18 +0200 In-Reply-To: <1433266446-2845-4-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr> (Remi Lespinet's message of "Tue, 2 Jun 2015 19:34:06 +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]); Wed, 03 Jun 2015 18:31:16 +0200 (CEST) X-IMAG-MailScanner-Information: Please contact MI2S MIM for more information X-MailScanner-ID: t53GVFgd002065 X-IMAG-MailScanner: Found to be clean X-IMAG-MailScanner-SpamCheck: X-IMAG-MailScanner-From: matthieu.moy@grenoble-inp.fr MailScanner-NULL-Check: 1433953876.70282@Z7doF+cZZJuINVeRefGm2w Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Remi Lespinet writes: > +am.threeWay:: > + By default, git-am will fail if the patch does not apply cleanly. http://article.gmane.org/gmane.comp.version-control.git/270538 -- Matthieu Moy http://www-verimag.imag.fr/~moy/