From patchwork Sat Oct 27 06:22:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10658109 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4123814E2 for ; Sat, 27 Oct 2018 06:24:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E6592BF74 for ; Sat, 27 Oct 2018 06:24:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 22E862BF90; Sat, 27 Oct 2018 06:24:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CBC642BF74 for ; Sat, 27 Oct 2018 06:24:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728404AbeJ0PEO (ORCPT ); Sat, 27 Oct 2018 11:04:14 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:33028 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728397AbeJ0PEO (ORCPT ); Sat, 27 Oct 2018 11:04:14 -0400 Received: by mail-lf1-f65.google.com with SMTP id w16-v6so2504194lfc.0 for ; Fri, 26 Oct 2018 23:24:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6NVMum0Q0HoAmXV/kluerySETlzqCfnczC+z2UtP6qo=; b=nlHyiW9JbH9CMYWNzpOu8+rXF7ZdzM85B76xwzBkOJyXLCCs6tDQJK1KKciqbIuT0m rapfhnnezR8Rz2h38nW+ijfSXXstyiw1jYJPMczNSEX3DP6fYhMHQSkXbkMp/oDNnj0a hwlBYJRn2tDqFErL0EyAmIrrOz6cfXFxpf2rsjeM3eAvOK+Dn2OSYzvbokvBUaVA4p7f bW2kXzxq2MiqFh4lQidOwlgEbG4+e5GrW8aJCapXqOaBG9qAnP4nSSrQd8qTQorAfT2Z cc2ifCss/vjmfQQj7nJfkFdq3SplPuUzhTTRtzVuiTqtG/84bmqVQuLSrDfE80AuL7GT 9s0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6NVMum0Q0HoAmXV/kluerySETlzqCfnczC+z2UtP6qo=; b=MAwbeeKeLKlJXse35g8yp++Xe9wgmIty9Erkxv8M4th44NfwOJiMSnnORSnlW0Wwk/ PBsEwB/1lOeqoDEDOb+DnYfYNkGDRXH9Ft88Ng2rgQoLV7NPY5rgKCUYkJg0DwaPbGMv KTWcgmuRBM/4tIQXxVnw9IwO1cgyhhWxqjqTAciqd+YhPXh/IEc59HoI3V7YZL7wInNs e3EaHsnrYd5CEsY9s49LO3gmETZGeBYOfdvwrzm0I39yJjR7BuUR/QD5KB+dKz4lj6PO 6zKt3YNmgrAkq/EBcSbJmp5bzskjON/g0xUfuEnwoj7FEmsPJJSp2lhDLJta/9yMHLRZ Tvvw== X-Gm-Message-State: AGRZ1gJkGILLN9lcjHDk9EVr6gR89qfeF7nYF1G4pLtitDPPTZV74mh5 +iQSG9s2EJq0Whz9XnS2QOWwJ33G X-Google-Smtp-Source: AJdET5ckHiVEKATgvs6sEJ6EnX7benB4KQAVVGtgCOobD2Chx+V2j6QcUcnPm5Mw477l1wD+CHrtSg== X-Received: by 2002:a19:ee08:: with SMTP id g8mr3965431lfb.72.1540621458585; Fri, 26 Oct 2018 23:24:18 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id c81-v6sm2097487lfe.79.2018.10.26.23.24.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24:17 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 18/78] config.txt: move diff-config.txt to config/ Date: Sat, 27 Oct 2018 08:22:51 +0200 Message-Id: <20181027062351.30446-19-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-1-pclouds@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 2 +- Documentation/{diff-config.txt => config/diff.txt} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename Documentation/{diff-config.txt => config/diff.txt} (99%) diff --git a/Documentation/config.txt b/Documentation/config.txt index 83f5ce9056..5693ce7654 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -319,7 +319,7 @@ include::config/credential.txt[] include::config/completion.txt[] -include::diff-config.txt[] +include::config/diff.txt[] difftool..path:: Override the path for the given tool. This is useful in case diff --git a/Documentation/diff-config.txt b/Documentation/config/diff.txt similarity index 99% rename from Documentation/diff-config.txt rename to Documentation/config/diff.txt index 85bca83c30..e4db77bc82 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/config/diff.txt @@ -177,7 +177,7 @@ diff.tool:: Any other value is treated as a custom diff tool and requires that a corresponding difftool..cmd variable is defined. -include::mergetools-diff.txt[] +include::../mergetools-diff.txt[] diff.indentHeuristic:: Set this option to `true` to enable experimental heuristics