From patchwork Wed Mar 6 06:30:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 10840453 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 09F471803 for ; Wed, 6 Mar 2019 06:31:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC0902C756 for ; Wed, 6 Mar 2019 06:31:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E0A522C77C; Wed, 6 Mar 2019 06:31:36 +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 9CAF62C756 for ; Wed, 6 Mar 2019 06:31:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728972AbfCFGbf (ORCPT ); Wed, 6 Mar 2019 01:31:35 -0500 Received: from mail-lj1-f194.google.com ([209.85.208.194]:41374 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726378AbfCFGai (ORCPT ); Wed, 6 Mar 2019 01:30:38 -0500 Received: by mail-lj1-f194.google.com with SMTP id z25so9818096ljk.8 for ; Tue, 05 Mar 2019 22:30:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=1u2C3HiAov1ZtE9L5OPD4t+SE1CMKObYrhXhj2/ZuBk=; b=Dd6IjEqjBCB4Joqaktzl6TKYIINFdXJi994MVUbpvXEBJ5wtW5fi0Qj02s2ml7SB1h gl+AUQ1MrfDspXO1glXXwbGcig2fwEoiZwt5YEkcsx1A++UDBdMtDbBpxdqNLcHjrqqk zfSphWao9vkc86p55LBVlFJfk7y4Ej4JZBYjm0MYFFrgyVm96XLYDOxExs15H9a+0GMx wsUGY/eBHiy7HEWMkBurPiITr0kvvhK+ZfZ/VvK8ZJQBAUgQRPWla6KcvVMQ+pBp1o9o nXD1ZCmHQRHvtE2p45Cx/F1g6bVtFtj38h5mQwqbWPKDMxb39HFNrPz+rHnqvTZmJnOF pX7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1u2C3HiAov1ZtE9L5OPD4t+SE1CMKObYrhXhj2/ZuBk=; b=ddpmQr9Lsd8dmEeoWFnt8W+D1IjSiGj9AakyuNS634Ni8CF5/yHfeiibwhrAskNxTd 4p92dgSx5Vguh1JI8Y3FDAblHAlC0YrT/BQgBEIXuo9hZcTin9kDLvZeLwK7NVxZz3Hq g9g1BregU0Rx9zkHwE33Tno+U5sJaqk9AQNSYd3/lmYg2JlZB97i7qqY58oXdzyfWe50 VzUWQaNC28B00OqNaB3HrOq1DZxQAAYfMrmRNoK5YGF2jL2pgffMRkdVtRucaPdu/5Iq +o4XYEML+h3bQObLj26j5EZUvBlt++DX4xPAMmVcW3qdzHiQr9c6Ui8+2zClXRoUPICz 46XA== X-Gm-Message-State: APjAAAVcnGE2umL06QudxmNZ1T085zLWNP9v6XAi+0XDlhdCWPluqnU6 A8FDk8BdlcYmi88q7HpqScJCeaso X-Google-Smtp-Source: APXvYqy83pvDkPr2VV9SG1XOF1kktFo2Q07njxgdYpZkXRCsEuOGF06jnm0VFS0vEA0iIQ4eHskPaA== X-Received: by 2002:a2e:81c7:: with SMTP id s7mr1469028ljg.146.1551853835543; Tue, 05 Mar 2019 22:30:35 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id u29sm149715ljd.84.2019.03.05.22.30.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2019 22:30:34 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 1/5] config/diff.txt: drop spurious backtick Date: Wed, 6 Mar 2019 07:30:14 +0100 Message-Id: X-Mailer: git-send-email 2.21.0 In-Reply-To: References: 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: Martin Ågren --- Documentation/config/diff.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt index e48bb987d7..7a1bae116a 100644 --- a/Documentation/config/diff.txt +++ b/Documentation/config/diff.txt @@ -10,7 +10,7 @@ diff.autoRefreshIndex:: diff.dirstat:: A comma separated list of `--dirstat` parameters specifying the - default behavior of the `--dirstat` option to linkgit:git-diff[1]` + default behavior of the `--dirstat` option to linkgit:git-diff[1] and friends. The defaults can be overridden on the command line (using `--dirstat=`). The fallback defaults (when not changed by `diff.dirstat`) are `changes,noncumulative,3`. From patchwork Wed Mar 6 06:30:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 10840451 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 4A3E71803 for ; Wed, 6 Mar 2019 06:31:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35B882C756 for ; Wed, 6 Mar 2019 06:31:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A4BE2C77C; Wed, 6 Mar 2019 06:31:35 +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 D02072C756 for ; Wed, 6 Mar 2019 06:31:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728923AbfCFGbd (ORCPT ); Wed, 6 Mar 2019 01:31:33 -0500 Received: from mail-lf1-f67.google.com ([209.85.167.67]:40520 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728972AbfCFGaj (ORCPT ); Wed, 6 Mar 2019 01:30:39 -0500 Received: by mail-lf1-f67.google.com with SMTP id a8so8042920lfi.7 for ; Tue, 05 Mar 2019 22:30:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6HZfNHF2F1EuctjDBQmf7V47UrCuX/tUZC9PRQKVxSI=; b=rU6XiZunR09sNee1YZfk1WthrhrpIb/ZuF9PcpGFFoIxo2xn8JDjEBL3O4YTV7pV8b yZnLAi43yFnswOykNJfSgJtoMhnNC15/HJWDrvC7GJX1ICu7isTJW9g8QCEE7ibtChz+ PROQ3CfSp322T0P3MrdC+NrOxS9Wq/IsGZ2Jdtp3sCYcWAa7fp0QxaAFf5akBTHK2wQ9 nVWtTK67B2JtR9ZWSm/23/UPFQvhzx7CW8E6/m0exuoL9KnmWcIrWh7Xj2uoL7AEwgTc Oxno34/CoFLp3klQuTt6cXhnmFpLh54YtHSkZwJTbOP9sIaT85HtaGkwdBT8NuN1sjTG Qj8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6HZfNHF2F1EuctjDBQmf7V47UrCuX/tUZC9PRQKVxSI=; b=dEpikOMzynsU8ikl1/X7Ixy7grGJNVsEMwECi6KerzPaRsiBlOJ2PcPIfx+nFDdhyS mL2L/sbegRBSEy5Y+w99OF8wn98c/dxXlLXGHmEPmjmVa7eDlJ2OyHCGQAsNJiJydwHW WZeJwoMhtyme8AniTCeJBvgf9FenuRGYMzb07yWp+ioWIoZwEoi2rubexVLTdow8j490 m7UjkZ0im6W02Q5icIL3jBiZDmEFQckxzHYhic0oHueSqjiiPsjY5AWcV+a9uaSvVPF5 4fEyqB4RxGKWZ1eI3rfX3/NdPIm5NqaT13LL/SjgGaOeH8CJWyRlD5CF/ULy5im4J/C+ 8QQw== X-Gm-Message-State: APjAAAWYnEltxot23jSzDC0knnkwMqxCOwrCZqfrXjQxtjCDdEahRwuS Yya0pVyqIZZG2ZYgFzMEoZ+zvMJ+ X-Google-Smtp-Source: APXvYqxXQ9sAtONDioEc11oaV9VKhpe07GCnIrPiKoqk6gA1JJFlCyck1uieFTm/ZjXekvqpZnup3w== X-Received: by 2002:a19:e601:: with SMTP id d1mr3048517lfh.71.1551853837088; Tue, 05 Mar 2019 22:30:37 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id u29sm149715ljd.84.2019.03.05.22.30.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2019 22:30:36 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 2/5] config/fsck.txt: avoid starting line with dash Date: Wed, 6 Mar 2019 07:30:15 +0100 Message-Id: X-Mailer: git-send-email 2.21.0 In-Reply-To: References: 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 This dash at the start of the line causes Asciidoctor to trip on the list continuations that follow and to render the pluses literally. Rewrap a little to put the dash elsewhere. Signed-off-by: Martin Ågren --- Documentation/config/fsck.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/config/fsck.txt b/Documentation/config/fsck.txt index 879c5a29c4..450e8c38e3 100644 --- a/Documentation/config/fsck.txt +++ b/Documentation/config/fsck.txt @@ -23,9 +23,9 @@ When `fsck.` is set, errors can be switched to warnings and vice versa by configuring the `fsck.` setting where the `` is the fsck message ID and the value is one of `error`, `warn` or `ignore`. For convenience, fsck prefixes the error/warning -with the message ID, e.g. "missingEmail: invalid author/committer line -- missing email" means that setting `fsck.missingEmail = ignore` will -hide that issue. +with the message ID, e.g. "missingEmail: invalid author/committer +line - missing email" means that setting `fsck.missingEmail = ignore` +will hide that issue. + In general, it is better to enumerate existing objects with problems with `fsck.skipList`, instead of listing the kind of breakages these From patchwork Wed Mar 6 06:30:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 10840431 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 4FF551803 for ; Wed, 6 Mar 2019 06:30:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3CD4B2C756 for ; Wed, 6 Mar 2019 06:30:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30EAF2C776; Wed, 6 Mar 2019 06:30:46 +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 D18552C756 for ; Wed, 6 Mar 2019 06:30:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729036AbfCFGao (ORCPT ); Wed, 6 Mar 2019 01:30:44 -0500 Received: from mail-lj1-f196.google.com ([209.85.208.196]:34492 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729000AbfCFGam (ORCPT ); Wed, 6 Mar 2019 01:30:42 -0500 Received: by mail-lj1-f196.google.com with SMTP id l5so9823823lje.1 for ; Tue, 05 Mar 2019 22:30:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=vl8jmySiWfe9420tqborbSybYzbKR31LT+s6o1XDrPI=; b=ZJa79ll+Na/2hExvA3GGJnV+5KtFpttOu+HfPXmrTFOHbPUiC8ltH7Eaf6VRKPnIYV AZu3bxxu9cnwPHR20jNndjy6Lg5gboyzKGno0NbrqBFgk8HmeNBZG1UlaSsUChs06dyZ NF1eDPFvBcASCXOiuRCcGdGCeebCEXACUblSkDf9NFeJ5Y7FAlmyxCOqZLq1LGAWBwGo dQMz3FTEE11JEMIv62h7Q1OL/6Jx32zxr+kr5hGKMmAarFCmoHUBSItxD370/aGXdK2C IrI2qbpNfQNOR4butvcAPX/u8BUDM8g3yx6M1zMYfZRKgba7fpMWyHvpbtrawApF6+1O MIZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vl8jmySiWfe9420tqborbSybYzbKR31LT+s6o1XDrPI=; b=D1NYo8nOb/PoMslXKeiJ+jFXUft3J2gcQLoY1HmUPjxj8QdALqW8ATQMOPkLTVI5zS hlNTHwGn1dozPcH4bmrxvbRhiqnopnxLuTscJAfHH5EODhaRsqr17CBDLfQZIo1lm9ga DjxbudVUhabrasrU+tNXAQ5af3de37ZqwTk/aLeuaUBvU4fU6A7UkAHeAVaj2AwFShke HvIIYEdHBD5/qrXm4F0Jh+hXGQwu1g4BXnnsVSxro0e2PSoMwHewyxxER8S17TS92T6X zQkntjFTGat/5zRritfl546GMmYXvryq2KRGYr3HETOD4P0pKQivZfh+Hm+uTPKrdfEC A7cQ== X-Gm-Message-State: APjAAAVYxvBY4exHxlx8RmXMHH/WPT6lWSdh8HVHn0e1zRfZbbBsz3YZ bTqo0lSScGu9ieMkkwDKSZHIhC1E X-Google-Smtp-Source: APXvYqzUpBIECQ/J10y0R6SZl+oLF2fLHmw5SKqpQdegNoQ+XVEQ0ct2H2wDf2NLss4rgkvuYDazPw== X-Received: by 2002:a2e:9d83:: with SMTP id c3mr1358969ljj.171.1551853839921; Tue, 05 Mar 2019 22:30:39 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id u29sm149715ljd.84.2019.03.05.22.30.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2019 22:30:39 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 3/5] git.txt: remove empty line before list continuation Date: Wed, 6 Mar 2019 07:30:16 +0100 Message-Id: X-Mailer: git-send-email 2.21.0 In-Reply-To: References: 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 This patch is a no-op for Asciidoctor, but makes AsciiDoc render this as intended. Signed-off-by: Martin Ågren --- Documentation/git.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/git.txt b/Documentation/git.txt index 00156d64aa..6d1f2fd9ae 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -536,7 +536,6 @@ other The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details. - + `$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. From patchwork Wed Mar 6 06:30:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 10840445 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 157BE1803 for ; Wed, 6 Mar 2019 06:31:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3ED22C756 for ; Wed, 6 Mar 2019 06:31:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E86AB2C77C; Wed, 6 Mar 2019 06:31:29 +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 8B8FA2C756 for ; Wed, 6 Mar 2019 06:31:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729105AbfCFGbY (ORCPT ); Wed, 6 Mar 2019 01:31:24 -0500 Received: from mail-lj1-f196.google.com ([209.85.208.196]:42186 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729024AbfCFGao (ORCPT ); Wed, 6 Mar 2019 01:30:44 -0500 Received: by mail-lj1-f196.google.com with SMTP id d14so9821488ljl.9 for ; Tue, 05 Mar 2019 22:30:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6BnabYJ5H0XQiOM0hdTrA4VRTbHtiYCuvOc1PCnj30o=; b=WMh5ij0kIL8uKt8t+/VaXrFUGJOw2Mr6DHnGokw0Gk01dcFdYHnvldNHW3OsbIsPyY DSTFJaTsFV8+xKCLB650t7+NqM025wSzzEzdZvfCg5TOXZcoA7gKQ3wQih9HxBEWBAE8 T5tyi8DSIUCh02911aZ/CXdjD4WIe41mkFz/Q8TPJKXc/qN7x56erX/Nlnd/r52XzZ19 DAn+e1EpqU5uq0sbVgiUuSB306hndyNcl2+wB3W+qEJFtl7dw5szUUVHAp/5ORtt2Bgd S4DWp/RXKD+ODHr+SnGh92TUdLeMuYDI4pU+O6kfNzUry/SSLxbnsIyawISn9ho+3RCY t6Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6BnabYJ5H0XQiOM0hdTrA4VRTbHtiYCuvOc1PCnj30o=; b=Y+Zanm3BmPqv07Xxsetofw2BpG+ExAiKe8rgRF2g2YHGTtyj0ZGio+GVPRtD4AKw2i 737CEsV0Ak2O5fUzeSNpjCwCaNJU7dw6Q653d0HXJNhcXBudhibVaj2LpvSi2QzPyqdh R/ahGoVzSt2/ZAyT4Yu9bqpxE1pObBb/kbwAczRiAlFi718XP1xuWkSLfNf4Dz8Sln1a 1CNc0X5dwB9GctloJ8UrzM8BHowdhN6FXxLNO0Mlug0pkDDLt9ZmTcEih1pUDrAlMlhA hNiiOQuRQW2aUOforo712zcb8aSWoROlFKdczNunOBWKTJF5VyIudmKXNZOIgHbr/rZ3 wW1w== X-Gm-Message-State: APjAAAW/JWaRnwIcW6R/LL1L7fSw7lkQiXKKTVPYJmfcQl0ykSta0AD/ 2YJ31ueTNdMh6E71ICnxcD2Z91eK X-Google-Smtp-Source: APXvYqwpBP8YBURXB+akYnzosnOJgiF1i7uyHmstfuyQdmcpB6DfSUJPtckulhJDMpc7TjYYfJz6Wg== X-Received: by 2002:a2e:9786:: with SMTP id y6mr1223379lji.79.1551853841771; Tue, 05 Mar 2019 22:30:41 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id u29sm149715ljd.84.2019.03.05.22.30.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2019 22:30:40 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 4/5] git-svn.txt: drop escaping '\' that ends up being rendered Date: Wed, 6 Mar 2019 07:30:17 +0100 Message-Id: <1864fee16647f526b507dcebca90629b37cc35a1.1551853194.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: References: 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 Escaping two *'s as "\*\*" apparently makes Asciidoctor render the second backslash literally, so we end up with "*\*". So let's not escape that second asterisk. The result is now "**" as intended, both in AsciiDoc and Asciidoctor. Signed-off-by: Martin Ågren --- Documentation/git-svn.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index b99029520d..223788fa3e 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -126,7 +126,7 @@ your Perl's Getopt::Long is < v2.37). command-line argument. + This automatically updates the rev_map if needed (see -'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details). +'$GIT_DIR/svn/\**/.rev_map.*' in the FILES section below for details). --localtime;; Store Git commit times in the local time zone instead of UTC. This @@ -239,7 +239,7 @@ Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes. + This automatically updates the rev_map if needed (see -'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details). +'$GIT_DIR/svn/\**/.rev_map.*' in the FILES section below for details). -l;; --local;; @@ -524,7 +524,7 @@ This will set the property 'svn:keywords' to 'FreeBSD=%H' for the file way to repair the repo is to use 'reset'. + Only the rev_map and refs/remotes/git-svn are changed (see -'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details). +'$GIT_DIR/svn/\**/.rev_map.*' in the FILES section below for details). Follow 'reset' with a 'fetch' and then 'git reset' or 'git rebase' to move local branches onto the new tree. @@ -760,7 +760,7 @@ svn-remote..noMetadata:: + This option can only be used for one-shot imports as 'git svn' will not be able to fetch again without metadata. Additionally, -if you lose your '$GIT_DIR/svn/\*\*/.rev_map.*' files, 'git svn' will not +if you lose your '$GIT_DIR/svn/\**/.rev_map.*' files, 'git svn' will not be able to rebuild them. + The 'git svn log' command will not work on repositories using @@ -1154,7 +1154,7 @@ fetching, then $GIT_DIR/svn/.metadata must be manually edited to remove FILES ----- -$GIT_DIR/svn/\*\*/.rev_map.*:: +$GIT_DIR/svn/\**/.rev_map.*:: Mapping between Subversion revision numbers and Git commit names. In a repository where the noMetadata option is not set, this can be rebuilt from the git-svn-id: lines that are at the From patchwork Wed Mar 6 06:30:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 10840443 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 BBE331803 for ; Wed, 6 Mar 2019 06:31:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5CF82C756 for ; Wed, 6 Mar 2019 06:31:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A5332C77C; Wed, 6 Mar 2019 06:31:20 +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 CCBD42C756 for ; Wed, 6 Mar 2019 06:31:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729123AbfCFGbO (ORCPT ); Wed, 6 Mar 2019 01:31:14 -0500 Received: from mail-lj1-f196.google.com ([209.85.208.196]:37151 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729039AbfCFGaq (ORCPT ); Wed, 6 Mar 2019 01:30:46 -0500 Received: by mail-lj1-f196.google.com with SMTP id a17so9799097ljd.4 for ; Tue, 05 Mar 2019 22:30:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=7Po2fWHLcXI+ma3BHX2wEFDkpCa426g/TdfL67gvg3k=; b=rjYs0O0wUB+6poQdaFvMffovxWXufMA99xJ0BgutT/B0rSzGm5YfDYKF3WGmzzcpkV 4pwge39JgY43jf4EQXcL7t3j+iC6pQudMXPNOiWXEfKEJtEJIhszx2HAWSFoY8nwOgfJ 0vDvB9js5qX+nbUFbeQpQ/Lnrz1lmcKDJir0Ucv8WVFSGu2Mo68Qy9twDH3ABExNUvVs QmfQ0/e2oeknqfbBIA3N3nD3HiVSMxMjHOl9ZKoSKRGoDElECohFcWHAKn0ol7d8MXTV asuIOCIpmc3BLrU/xZwnWQbg1ed1dawDRgnnoky56RLNYgEsKjCzs5MB1ohRLz6QKFH9 +aXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7Po2fWHLcXI+ma3BHX2wEFDkpCa426g/TdfL67gvg3k=; b=JpG2n2J8U6xSiEcnBteZQCDg9f5TgXclbuiL5jxgCKtc4nzR0S5OCtAn18kXfmnkOt xSKfFf5NciAchD7Y/h385Nki67a6u47NB45QiNHk3RbTL3Qh+kvHZcowXo4KI/GVrQBO J4tcrSUB/dMEpbmd/JN+9YPIZKec3epkEO0GtG1t3xU7mIK0Ut4ceqOCo3W+3wfTbVTE V+99yhIOYk2KQfwVixW5zvrJxfslP0Q2s/B2umtjpQptx9MdAOQQaFCh5bGx2ObS4wru ZoWo438kOfw5EREJj9VoouoFUK7G4lFuvc+W1jiA3uvrkHpuFnPOcj0v2l+DMDaodQ+B wTjA== X-Gm-Message-State: APjAAAWuzpWxkAZo1OhCFSoqCyd4sNBClalYaKeMw4h40N2Gryf044ud CVgAgKkE2qAE1V/QUdu1FbiUAi6x X-Google-Smtp-Source: APXvYqzHpcHY5S81RiEIaWLFYeUTsouwXef07xpko2l47941PkfC3UhnlwzAuciQy95Ru3ziHJoBhw== X-Received: by 2002:a2e:8886:: with SMTP id k6mr1493650lji.43.1551853843528; Tue, 05 Mar 2019 22:30:43 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id u29sm149715ljd.84.2019.03.05.22.30.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2019 22:30:42 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 5/5] Documentation: turn middle-of-line tabs into spaces Date: Wed, 6 Mar 2019 07:30:18 +0100 Message-Id: <4348f7b1b661181b90bf25f43c07529fa9757422.1551853194.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: References: 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 These tabs happen to appear in columns where they don't stand out too much, so the diff here is non-obvious. Some of these are rendered differently by AsciiDoc and Asciidoctor (although the difference might be invisible!), which is how I found a few of them. The remainder were found using `git grep "[a-zA-Z.,)]$TAB[a-zA-Z]"`. Signed-off-by: Martin Ågren --- Documentation/config/diff.txt | 2 +- Documentation/config/gc.txt | 2 +- Documentation/config/gpg.txt | 2 +- Documentation/git-config.txt | 2 +- Documentation/git-grep.txt | 2 +- Documentation/git-http-backend.txt | 2 +- Documentation/git-ls-remote.txt | 2 +- Documentation/git-notes.txt | 2 +- Documentation/gitattributes.txt | 2 +- Documentation/gitremote-helpers.txt | 2 +- Documentation/gitweb.conf.txt | 2 +- Documentation/rev-list-options.txt | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt index 7a1bae116a..2c4c9ba27a 100644 --- a/Documentation/config/diff.txt +++ b/Documentation/config/diff.txt @@ -73,7 +73,7 @@ diff.external:: environment variable. The command is called with parameters as described under "git Diffs" in linkgit:git[1]. Note: if you want to use an external diff program only on a subset of - your files, you might want to use linkgit:gitattributes[5] instead. + your files, you might want to use linkgit:gitattributes[5] instead. diff.ignoreSubmodules:: Sets the default value of --ignore-submodules. Note that this diff --git a/Documentation/config/gc.txt b/Documentation/config/gc.txt index c6fbb8a96f..73c08b0c00 100644 --- a/Documentation/config/gc.txt +++ b/Documentation/config/gc.txt @@ -19,7 +19,7 @@ gc.autoPackLimit:: When there are more than this many packs that are not marked with `*.keep` file in the repository, `git gc --auto` consolidates them into one larger pack. The - default value is 50. Setting this to 0 disables it. + default value is 50. Setting this to 0 disables it. gc.autoDetach:: Make `git gc --auto` return immediately and run in background diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt index 590fe0d4ba..f999f8ea49 100644 --- a/Documentation/config/gpg.txt +++ b/Documentation/config/gpg.txt @@ -16,5 +16,5 @@ gpg.format:: gpg..program:: Use this to customize the program used for the signing format you chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still - be used as a legacy synonym for `gpg.openpgp.program`. The default + be used as a legacy synonym for `gpg.openpgp.program`. The default value for `gpg.x509.program` is "gpgsm". diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 1bfe9f56a7..7d857f34c6 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -126,7 +126,7 @@ See also <>. --local:: For writing options: write to the repository `.git/config` file. - This is the default behavior. + This is the default behavior. + For reading options: read only from the repository `.git/config` rather than from all available files. diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index 84fe236a8e..2d27969057 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -88,7 +88,7 @@ OPTIONS mechanism. Only useful with `--untracked`. --exclude-standard:: - Do not pay attention to ignored files specified via the `.gitignore` + Do not pay attention to ignored files specified via the `.gitignore` mechanism. Only useful when searching files in the current directory with `--no-index`. diff --git a/Documentation/git-http-backend.txt b/Documentation/git-http-backend.txt index bb0db195ce..558966aa83 100644 --- a/Documentation/git-http-backend.txt +++ b/Documentation/git-http-backend.txt @@ -162,7 +162,7 @@ ScriptAliasMatch ^/git/[^/]*(.*) /usr/libexec/git-core/git-http-backend/storage. Accelerated static Apache 2.x:: Similar to the above, but Apache can be used to return static - files that are stored on disk. On many systems this may + files that are stored on disk. On many systems this may be more efficient as Apache can ask the kernel to copy the file contents from the file system directly to the network: + diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt index b9fd3770a6..0b057cbb10 100644 --- a/Documentation/git-ls-remote.txt +++ b/Documentation/git-ls-remote.txt @@ -31,7 +31,7 @@ OPTIONS displayed. --refs:: - Do not show peeled tags or pseudorefs like HEAD in the output. + Do not show peeled tags or pseudorefs like `HEAD` in the output. -q:: --quiet:: diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt index df2b64dbb6..f56a5a9197 100644 --- a/Documentation/git-notes.txt +++ b/Documentation/git-notes.txt @@ -146,7 +146,7 @@ OPTIONS -C :: --reuse-message=:: - Take the given blob object (for example, another note) as the + Take the given blob object (for example, another note) as the note message. (Use `git notes copy ` instead to copy notes between objects.) diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index b8392fc330..c2c10eef7c 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -18,7 +18,7 @@ A `gitattributes` file is a simple text file that gives Each line in `gitattributes` file is of form: - pattern attr1 attr2 ... + pattern attr1 attr2 ... That is, a pattern followed by an attributes list, separated by whitespaces. Leading and trailing whitespaces are diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt index 9d1459aac6..4f2905dc5d 100644 --- a/Documentation/gitremote-helpers.txt +++ b/Documentation/gitremote-helpers.txt @@ -468,7 +468,7 @@ set by Git if the remote helper has the 'option' capability. 'option dry-run' {'true'|'false'}: If true, pretend the operation completed successfully, - but don't actually change any repository data. For most + but don't actually change any repository data. For most helpers this only applies to the 'push', if supported. 'option servpath ':: diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt index c0a326e388..57e50b6911 100644 --- a/Documentation/gitweb.conf.txt +++ b/Documentation/gitweb.conf.txt @@ -536,7 +536,7 @@ $omit_owner:: $per_request_config:: If this is set to code reference, it will be run once for each request. - You can set parts of configuration that change per session this way. + You can set parts of configuration that change per session this way. For example, one might use the following code in a gitweb configuration file + diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index bab5f50b17..918749b890 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -742,7 +742,7 @@ is supported, which omits all blobs and trees. --filter-print-omitted:: Only useful with `--filter=`; prints a list of the objects omitted - by the filter. Object IDs are prefixed with a ``~'' character. + by the filter. Object IDs are prefixed with a ``~'' character. --missing=:: A debug option to help with future "partial clone" development.