From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Tan Subject: [PATCH] git-am: add am.threeWay config variable Date: Tue, 4 Aug 2015 22:19:26 +0800 Message-ID: <1438697966-4958-1-git-send-email-pyokagan@gmail.com> Cc: Junio C Hamano , Paul Tan , Remi Lespinet To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Aug 04 16:19:39 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 1ZMd46-0005lX-96 for gcvg-git-2@plane.gmane.org; Tue, 04 Aug 2015 16:19:38 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756733AbbHDOTe (ORCPT ); Tue, 4 Aug 2015 10:19:34 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:34555 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751884AbbHDOTd (ORCPT ); Tue, 4 Aug 2015 10:19:33 -0400 Received: by pawu10 with SMTP id u10so9753673paw.1 for ; Tue, 04 Aug 2015 07:19:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=imD8k3wq97oRzqV86rO9MOKLepm4v9XpYEeIKw6AxcI=; b=C4bPzRILkSTogfq6RkSsbXOgQZpAJRJCJRi0U7WMuOoXGrOQL9v8fQhLAFarRm5jTb hAyWSMBZnAkTUvJDVEjMsttYFp++WlhlVcz9X+BZ4F+qxYG8R208twjVyduOlXLk0P00 WEYcuU66Vze1pWgwvdazMov1f6bDJ47HtvVZ+cXat9oJUQGNuWVme91NSMbTwt4/vtPG M45Ye3Ru1aRhfpxgWQjJGj6VfMQuDVlc73yA6AIqMQGZCfrzZu/djINZa45yKLzEnoLD ezv7FxWlUEU01zvkLKEqMETA+xL+XedYZ174L0W3fqPkkF1YAes65Xpf9uepLRc0TIpX 8n5w== X-Received: by 10.69.3.228 with SMTP id bz4mr8353223pbd.79.1438697973222; Tue, 04 Aug 2015 07:19:33 -0700 (PDT) Received: from yoshi.pyokagan.tan ([116.86.132.138]) by smtp.gmail.com with ESMTPSA id f1sm1656275pdp.39.2015.08.04.07.19.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Aug 2015 07:19:32 -0700 (PDT) X-Mailer: git-send-email 2.5.0.280.gd88bd6e Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Remi Lespinet Add the am.threeWay configuration variable to use the -3 or --3way option of git am by default. When am.threeway is set and not desired for a specific git am command, the --no-3way option can be used to override it. Signed-off-by: Remi Lespinet Signed-off-by: Paul Tan --- I tweaked Remi's patch so it is implemented on top of builtin/am.c. Hopefully there will be no regressions this time ;) Documentation/config.txt | 8 ++++++++ Documentation/git-am.txt | 7 +++++-- builtin/am.c | 2 ++ t/t4150-am.sh | 19 +++++++++++++++++++ 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 315f271..fb3fc57 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -769,6 +769,14 @@ am.keepcr:: by giving '--no-keep-cr' from the command line. See linkgit:git-am[1], linkgit:git-mailsplit[1]. +am.threeWay:: + By default, `git am` will fail if the patch does not apply cleanly. When + set to true, this setting tells `git am` to fall back on 3-way merge if + the patch records the identity of blobs it is supposed to apply to and + we have those blobs available locally (equivalent to giving the `--3way` + option from the command line). Defaults to `false`. + See linkgit:git-am[1]. + apply.ignoreWhitespace:: When set to 'change', tells 'git apply' to ignore changes in whitespace, in the same way as the '--ignore-space-change' diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 0d8ba48..dbea6e7 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] - [--3way] [--interactive] [--committer-date-is-author-date] + [--[no-]3way] [--interactive] [--committer-date-is-author-date] [--ignore-date] [--ignore-space-change | --ignore-whitespace] [--whitespace=