From patchwork Sat Oct 20 12:38:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650493 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 0C05014E2 for ; Sat, 20 Oct 2018 12:40:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA6082861D for ; Sat, 20 Oct 2018 12:40:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF28428620; Sat, 20 Oct 2018 12:40:17 +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 84D4B2861D for ; Sat, 20 Oct 2018 12:40:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727738AbeJTUug (ORCPT ); Sat, 20 Oct 2018 16:50:36 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:32807 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727692AbeJTUug (ORCPT ); Sat, 20 Oct 2018 16:50:36 -0400 Received: by mail-lj1-f195.google.com with SMTP id z21-v6so33118003ljz.0 for ; Sat, 20 Oct 2018 05:40:14 -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=fVa8gG3KQx9z1I7+2T5HAnbon06rqilvzFi8WN+ki7s=; b=Kx/i90IYm/OTNqAt/LF87B2zvqCgoyDgkEZR1fOIUgmhyFKBAVo9sLACrsM3ZOr1ZB ZnkTTXg4FIyIfxOvqnSLb7ZI63i4UR+I/JKNahonXFUluSEfHBqXye6ZfhnuwiE25dyV 4+XK1CwOD+T/UPkw8RhBdJ/nySOCPwxPvjGFu7Y4fcwRM2Oudw6v1i0HfeuVXvkBFJDo xUNLOkx70HG4S3i2VIzfthAhCQ/OOZV0sIyn2J/XGZ3KbPf7wmSH6oLfeNJC/ILvH1pX sLKGLObHVsrjMFCy3ifbgDs6htkFhTpqNoHPpShoVmXyJvFk97MBU1B0XftjAKN9ACRP K8Hg== 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=fVa8gG3KQx9z1I7+2T5HAnbon06rqilvzFi8WN+ki7s=; b=PJBsxsdV243BtLdmM3PzGLBlsslBesHy8zyXt19tg75ZqjygBQRX3l7QfN+zj1cgsJ WfXfaNFTPH+gK2A0k9gIfaiTaB7rJqh7sohRflqw5DQ2djhmjCzhJbi5+8fKNWZjzo/O SK661MZF96/2O47jr5UJnhvhioc1MY5kjSzHX7ZLMf87jZPRfBtQlUEse4CAmEdlVTaP wvGOapCG998tfyiMHXjKsw8G9NbeCFWwbF/6QAy958pUffTZCmbpCUEGpCrt3M/4vpBQ 5mBE95fwXUvYGxYbGeJy4NeNLqRJo+1HSxcX0FVPg+KWMbymPo5wk5KM4K5pwxx5jqLE uqNw== X-Gm-Message-State: ABuFfoheJLJ87jtUoNPpbexKTKhM8Lgm3+AIT6r4vgdPM4TUzzREgKjK PVAjjyEpMMYeWNBHOJ2QPuw+sj9G X-Google-Smtp-Source: ACcGV636kPbGsgHommKHA4N2WQSd5Zf4gr0omgXGm4TdhMHkIYdGTrVbJqbo0JVUJ/UTbBE1Ad1SAw== X-Received: by 2002:a2e:3e0b:: with SMTP id l11-v6mr27511150lja.16.1540039213698; Sat, 20 Oct 2018 05:40:13 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:12 -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 48/59] config.txt: move showBranch.* to a separate file Date: Sat, 20 Oct 2018 14:38:37 +0200 Message-Id: <20181020123848.2785-49-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-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 | 4 +--- Documentation/showbranch-config.txt | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Documentation/showbranch-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index e5454df2f8..6136c5638c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -656,9 +656,7 @@ include::sendemail-config.txt[] include::sequencer-config.txt[] -showBranch.default:: - The default set of branches for linkgit:git-show-branch[1]. - See linkgit:git-show-branch[1]. +include::showbranch-config.txt[] splitIndex.maxPercentChange:: When the split index feature is used, this specifies the diff --git a/Documentation/showbranch-config.txt b/Documentation/showbranch-config.txt new file mode 100644 index 0000000000..e79ecd9ee9 --- /dev/null +++ b/Documentation/showbranch-config.txt @@ -0,0 +1,3 @@ +showBranch.default:: + The default set of branches for linkgit:git-show-branch[1]. + See linkgit:git-show-branch[1].