Message ID | 20181020123848.2785-7-pclouds@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <git-owner@kernel.org> 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 A2807112B for <patchwork-git@patchwork.kernel.org>; Sat, 20 Oct 2018 12:39:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8AB4C28620 for <patchwork-git@patchwork.kernel.org>; Sat, 20 Oct 2018 12:39:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7EB842861E; Sat, 20 Oct 2018 12:39:13 +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 B8B4C28628 for <patchwork-git@patchwork.kernel.org>; Sat, 20 Oct 2018 12:39:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727459AbeJTUtZ (ORCPT <rfc822;patchwork-git@patchwork.kernel.org>); Sat, 20 Oct 2018 16:49:25 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:37844 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727382AbeJTUtZ (ORCPT <rfc822;git@vger.kernel.org>); Sat, 20 Oct 2018 16:49:25 -0400 Received: by mail-lj1-f194.google.com with SMTP id 63-v6so33121598ljs.4 for <git@vger.kernel.org>; Sat, 20 Oct 2018 05:39:04 -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=4JEenVR9za5HZ4eY/6eB9B9/u9N8IKGgMi9L0bn2PMQ=; b=RKfs8n4zksLP/eWmTbPicGcQes/II9HMVxCeE5Yqwb55YAQ+9e86ZLbjLo+wdtZIhu 2ZKbQsP+OjMD2m4guXK8KzIIqtUa09x8NxyRxQD2xThSmWtKqUdDi6ew8b3uNPEs2+D4 LNoM96Ahc8atz6hqyTQ2NfayoLnQRDl3/hhEIBuirU2g+Kc81l9t5SHRuOH3ngGKzCD+ PYbyhWq+td90utO+ZBTiOF/Ycb99YoL4aGgYJLgFXCVnDWC9IFMe0ksSK4fR6C0pl/ui jzHT70jMOjlAzopG+codxBaUpjgbC+RU79/HYeIBKeBmzNAY2kqU3O2VjXSOHUEfqygW AcEw== 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=4JEenVR9za5HZ4eY/6eB9B9/u9N8IKGgMi9L0bn2PMQ=; b=gf3kbqDJqXXCtpgEreTq9SyATAHCMXA/jJzp7OR+0bZ8IR13OjiEZG5/QC2AbQLTUg yS31AKm+UXrmZ+CqR1QzPrO4btaZB7difq+qV6TL0iLkw3jTvkAEoTmv7n5GOOjDtfC7 W2BSDtfRPN5Qni445hBfqRyvCVWS4t08KiF8V9PKPZvmVBg4kcnQrBcg35Bt9/fWNDX3 MlzzUuPj9zJC2j/+W0wtnmeWRMRglAQtIpW3Yf4Qm7LtujZ+xCnmMraqtES8DbXRbCWP 19AtjW5SFE8jo1mPo0ySi+X6FGTV1zirwMlx/xIdPprZU3pGZ5V4NxJFfEM+hh/8GA7e tsCw== X-Gm-Message-State: ABuFfoh/eAC6Tncti1XjVMOli4cvKUtXqDQX1HMFRwwY7ns/hsTLrKzR 96r7GuE8H1ND1mRDHM4zVhHZnGEi X-Google-Smtp-Source: ACcGV62s+hXwxU4rbNXqt8Ebs3G/ycxbP+aAwJoxPEL6XjTnrJGihj0QOrPw0w/XCpGHc/zwolf8ew== X-Received: by 2002:a2e:80d2:: with SMTP id r18-v6mr28042726ljg.100.1540039143206; Sat, 20 Oct 2018 05:39:03 -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.39.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:02 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= <pclouds@gmail.com> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= <pclouds@gmail.com> Subject: [PATCH 06/59] config.txt: move apply.* to a separate file Date: Sat, 20 Oct 2018 14:37:55 +0200 Message-Id: <20181020123848.2785-7-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: <git.vger.kernel.org> X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
Split config.txt
|
expand
|
diff --git a/Documentation/apply-config.txt b/Documentation/apply-config.txt new file mode 100644 index 0000000000..8fb8ef763d --- /dev/null +++ b/Documentation/apply-config.txt @@ -0,0 +1,11 @@ +apply.ignoreWhitespace:: + When set to 'change', tells 'git apply' to ignore changes in + whitespace, in the same way as the `--ignore-space-change` + option. + When set to one of: no, none, never, false tells 'git apply' to + respect all whitespace differences. + See linkgit:git-apply[1]. + +apply.whitespace:: + Tells 'git apply' how to handle whitespaces, in the same way + as the `--whitespace` option. See linkgit:git-apply[1]. diff --git a/Documentation/config.txt b/Documentation/config.txt index 29dd694438..db259129b0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -297,17 +297,7 @@ include::alias-config.txt[] include::am-config.txt[] -apply.ignoreWhitespace:: - When set to 'change', tells 'git apply' to ignore changes in - whitespace, in the same way as the `--ignore-space-change` - option. - When set to one of: no, none, never, false tells 'git apply' to - respect all whitespace differences. - See linkgit:git-apply[1]. - -apply.whitespace:: - Tells 'git apply' how to handle whitespaces, in the same way - as the `--whitespace` option. See linkgit:git-apply[1]. +include::apply-config.txt[] blame.blankBoundary:: Show blank commit object name for boundary commits in
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- Documentation/apply-config.txt | 11 +++++++++++ Documentation/config.txt | 12 +----------- 2 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 Documentation/apply-config.txt