From patchwork Sat Oct 27 06:23:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10658159 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 BB63313A4 for ; Sat, 27 Oct 2018 06:24:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A7F252BF74 for ; Sat, 27 Oct 2018 06:24:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C8EA2BF90; Sat, 27 Oct 2018 06:24:54 +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 888412BF74 for ; Sat, 27 Oct 2018 06:24:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728490AbeJ0PEq (ORCPT ); Sat, 27 Oct 2018 11:04:46 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:45241 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728309AbeJ0PEp (ORCPT ); Sat, 27 Oct 2018 11:04:45 -0400 Received: by mail-lf1-f66.google.com with SMTP id c24-v6so2470140lfi.12 for ; Fri, 26 Oct 2018 23:24:50 -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=AvaIxiBWAf0pqdeCL7VbisBKHOTqr0sIV52W+JIJd8U=; b=uiOnZs/cZmh0ppio6dJuM2qa3yuHTzJBOt5LLR6w+Lw+Z3fIFqFsOlQVNMQuhRWKZj t2DwqbgUk+Ss3pLh4ieNM/L6YkV8IWhTf089Cc2k+P4KQMZEr6CfKCe13/VvLf8tdk9n GicF4dngEpLgGZR9PtnLkWrCqsaxbKnA+x2QTaSODp7x84YAs3ZL8R6DjZfntGLmmZJl KzkxHk1vDHvhmBIpxD7R7TKbMCVEIOLXkd7a+7OJj4sUdT/SVB0Ev6w6COYUa+ZE36Z0 4EWychETgpsAvJLij2CIasO1zWUBiyEp5B4VbUA6SSvCPSFHKR2DLgYsDzZ6L+fkSJJF PU7A== 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=AvaIxiBWAf0pqdeCL7VbisBKHOTqr0sIV52W+JIJd8U=; b=j0Y7BvKNglNmbvvEXho/Hm/HQY14eiXYAQbY0tFi3EZl7Omf37ah92geL0fYLewpEX GwdvtmyQJWPKD4tpAS3RNjh2QAihzGEYC9GoaHDXojrcNnI1MMe9wilhyxQrL/XBmDwR GvOn0/VxL7v3/3kBZz5RJzEshS2IYutsVfWkPdGhxCJcPUUAOqF0TjFnfpE+lG5Xe01J YlFhpEXjm5xoLEDf6346ApJSWqPdVZsbJ3Ni3esxUR1fN5ztqN1LXDPyEAtM8e4nQ6Lr JcVCOsHirXWp+7xdzb6RIOFFXeHZZLr4wWLqJbKRbYnLZvaSC/joVAiKEGqFV6u9Cm56 LwIQ== X-Gm-Message-State: AGRZ1gKpr7a82z9ltkGqyAyhfMpFSsU4wjl3iGr0GIyVWiP2DnD7w7Tb eQoZKmY+7yiqBQwZTbFEKa9znMah X-Google-Smtp-Source: AJdET5eb4kXM58G3u1rcCKFY2WaB0AJ0sRXgX+HwX/IczfiG5ZXZ9M56polv41O9My3r4YQ0CZ/0cw== X-Received: by 2002:a19:5a84:: with SMTP id y4mr4019447lfk.156.1540621489729; Fri, 26 Oct 2018 23:24:49 -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.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24:49 -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 46/78] config.txt: move merge-config.txt to config/ Date: Sat, 27 Oct 2018 08:23:19 +0200 Message-Id: <20181027062351.30446-47-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/{merge-config.txt => config/merge.txt} | 4 ++-- Documentation/git-merge.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename Documentation/{merge-config.txt => config/merge.txt} (98%) diff --git a/Documentation/config.txt b/Documentation/config.txt index c3c92bc269..441787e815 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -371,7 +371,7 @@ include::config/mailmap.txt[] include::config/man.txt[] -include::merge-config.txt[] +include::config/merge.txt[] mergetool..path:: Override the path for the given tool. This is useful in case diff --git a/Documentation/merge-config.txt b/Documentation/config/merge.txt similarity index 98% rename from Documentation/merge-config.txt rename to Documentation/config/merge.txt index 0bb703fbac..321d1c8ba9 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/config/merge.txt @@ -30,7 +30,7 @@ merge.verifySignatures:: If true, this is equivalent to the --verify-signatures command line option. See linkgit:git-merge[1] for details. -include::config/fmt-merge-msg.txt[] +include::fmt-merge-msg.txt[] merge.renameLimit:: The number of files to consider when performing rename detection @@ -63,7 +63,7 @@ merge.tool:: Any other value is treated as a custom merge tool and requires that a corresponding mergetool..cmd variable is defined. -include::mergetools-merge.txt[] +include::../mergetools-merge.txt[] merge.verbosity:: Controls the amount of output shown by the recursive merge diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index eb36837f86..4cc86469f3 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -342,7 +342,7 @@ include::merge-strategies.txt[] CONFIGURATION ------------- -include::merge-config.txt[] +include::config/merge.txt[] branch..mergeOptions:: Sets default options for merging into branch . The syntax and