From patchwork Sat Dec 15 11:27:39 2018 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: 10732171 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 962531399 for ; Sat, 15 Dec 2018 11:28:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7EF582BFDD for ; Sat, 15 Dec 2018 11:28:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 735D82BFE1; Sat, 15 Dec 2018 11:28: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 ED72E2BFE0 for ; Sat, 15 Dec 2018 11:28:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729686AbeLOL2D (ORCPT ); Sat, 15 Dec 2018 06:28:03 -0500 Received: from mail-lj1-f194.google.com ([209.85.208.194]:41727 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729029AbeLOL2D (ORCPT ); Sat, 15 Dec 2018 06:28:03 -0500 Received: by mail-lj1-f194.google.com with SMTP id k15-v6so7087741ljc.8 for ; Sat, 15 Dec 2018 03:28:01 -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=KDejZoiRCdJlgiIo/ecPVYc10vkx+EzY8xGSu8cn5y8=; b=UD6g0n93vyt/JzC1m/3HsIAcVHFtqxCq1a3w5ipS1+rFvkoATWn1eLUAbG6M57sefz CyhLdOrMuaChF16+gw/up6Ni1QpIwPdHWHhRYKnapgcE3Uv/H8MDwiFJJqh3ijM/Fmb5 Vpm8Pt36heGhbNQcqcM2QfGuG9Mpnd4DQyxkG3+ke5PtIE3V6rVgDPdtOUo1kBplQ6ui zGQ5OwRLb5DYEbAA/2jAWK6iCc9u5ZQi1zZhkHVVZYXDDWvLJoYpnu18zjEnxQjAFoh+ v7ZHNSUzlnH1Q6z7xAdVugqRvpbRYm6sMGnLBzi4JWQ1YmKOC9986EiLhwV2lPdjMLF3 LB9g== 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=KDejZoiRCdJlgiIo/ecPVYc10vkx+EzY8xGSu8cn5y8=; b=PaSPi/ntXL7M782HF6VEWqEZP+7/pUaaI53eIy3MicDIh3ZMTWK9E1hhW4nUg6llHh ipRnthP7rMmdc6WpnQrhpgeZDfLMaDgQsqFXily/J8f6bkIdF5ftvnQp6tRCUkySAGTa 4UAyBIB4aBHinTh/08hGublQf8ZRAYqmWKqgFtkAAi6ON3XyZR6BNGTMol/KOq4/Y17r uwLQhV26Rt+dXPrAPm2EbIwGA+7tFLaIYwUTAOf1ETuNltgBBxuySEaoGYXZXrM2iEpz L55QNGLPFfrPdnzymCVBZbxVlQQk7I15xd+Q79RKXE6qXd5i6mcCS2ItghpxUYFMAj+g lsiw== X-Gm-Message-State: AA+aEWa45TnMK8S7mtKbAcFxzKgrCCg8NjGJPNq6DiJAAHLFcWHNpm9d JqhoEFzbXXBdNpX6uJx3QLzdgRno X-Google-Smtp-Source: AFSGD/W1ct9+R3bDzeqXz+/+ZCVwSAGpG6v/98aaUZCu0kH1SXfa5ViIhL2XU1AtnryW74bFpeHXDg== X-Received: by 2002:a2e:1551:: with SMTP id 17-v6mr3736554ljv.68.1544873279787; Sat, 15 Dec 2018 03:27:59 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id t18sm1439174lft.93.2018.12.15.03.27.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Dec 2018 03:27:59 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 1/4] git-column.txt: fix section header Date: Sat, 15 Dec 2018 12:27:39 +0100 Message-Id: <20181215112742.1475882-2-martin.agren@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181215112742.1475882-1-martin.agren@gmail.com> References: <20181215112742.1475882-1-martin.agren@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 We have too few dashes under "Examples", which causes Asciidoctor to not pick it up as a section header, but to instead just render the dashes literally. This also seems to confuse Asciidoctor about dashes in general around here. It misinterprets the listing blocks in this section, again rendering the dashes literally. Make sure we have as many dashes as we have characters in "Examples". This fixes the section-issue and, somehow, makes the listing blocks render correctly. Asciidoc renders identically before and after this patch, both man-page and html. Signed-off-by: Martin Ågren --- See https://git-scm.com/docs/git-column Documentation/git-column.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-column.txt b/Documentation/git-column.txt index 763afabb6d..f58e9c43e6 100644 --- a/Documentation/git-column.txt +++ b/Documentation/git-column.txt @@ -47,7 +47,7 @@ OPTIONS The number of spaces between columns. One space by default. EXAMPLES ------- +-------- Format data by columns: ------------ From patchwork Sat Dec 15 11:27:40 2018 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: 10732165 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 A8D461399 for ; Sat, 15 Dec 2018 11:28:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9799F2BFEF for ; Sat, 15 Dec 2018 11:28:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C3DB2BFF5; Sat, 15 Dec 2018 11:28:16 +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 19C6D2BFE1 for ; Sat, 15 Dec 2018 11:28:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729949AbeLOL2G (ORCPT ); Sat, 15 Dec 2018 06:28:06 -0500 Received: from mail-lf1-f66.google.com ([209.85.167.66]:36517 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729029AbeLOL2G (ORCPT ); Sat, 15 Dec 2018 06:28:06 -0500 Received: by mail-lf1-f66.google.com with SMTP id a16so6175561lfg.3 for ; Sat, 15 Dec 2018 03:28:04 -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=qwDLPaHk/a08xuM81ceQobPF7e0Ic+D3A1phOdtbsN0=; b=b05cdo14MxLxsWPkba9hBUxT9r2bBSTrtdd10dNMarP7alXX8/GYDMlB6/Jwn6D3hM PTjugyXiTUqJBMvTPOJBe2v2z3/4SGPwlk75PtngRpbc/yIeAKbh1I30+iIzFFWfjt65 Yr7oPWZb3U2Dm+Ddfx3Fm2P+SmPQgxj2J/zzRoWh9ncAMOIC7/lTy75Ex6bcFz2vf5Yd KD1Y+0Qo+PD/A+qVK/xJahqWixbQwVf2iMTs+TXc3hr0AvBPBqBLjcVKGORdkySr06ud 2GIxjX6YmNWTqOXhN+fQ9ra57CgCAEQS1/XfObSNJZch+AO+lzjfSp5eQPrhK+4fQAoV cxZw== 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=qwDLPaHk/a08xuM81ceQobPF7e0Ic+D3A1phOdtbsN0=; b=RqE0PGYa1Q2WcAv4k+yznN5pv0iL+wxhqyuNs5U8Oq2ADJp44R9/cDoJeulx9fHYHm X4rYOsZvQAdln8YtkVsIIyX/GQKYS8ZDKbbqeTXG48HuxFb12d0ZFzXyuJgtJDzaYmS0 RMjTfl5Gzd0ZeeUUIt9HSFwbCroaG0wQjgzQxVWVju6N46UbWmpJuxSXzQVbkJWA5fi6 lvPfZMEQ9aaC1G87beBEIA7DyjEpfnpeua85cy4GErbKZYL1jgdnStlsFYfAHf7LBtFA Ad0lrDifitpKor0PyXjewgO2RVu0Npku3ivj9gaOVoPZD+te7OQUxyi0Oi2yFwYuzNVo 0KHQ== X-Gm-Message-State: AA+aEWYSqHpxulmMR/dwXsvEZbBY4VADx4oElFlkCr7EAJGVz9VGScek MHWXXX8ARwa/D+WA/wKUEx6F7ZJD X-Google-Smtp-Source: AFSGD/UF2bjxBsqrsbJRPnBlldlYF6jhYnTTYu7aockyIrHkB/rRARNl8DveG5Guu9zIC8h3REGurg== X-Received: by 2002:a19:a84e:: with SMTP id r75mr3919085lfe.45.1544873281938; Sat, 15 Dec 2018 03:28:01 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id t18sm1439174lft.93.2018.12.15.03.28.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Dec 2018 03:28:01 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 2/4] git-init.txt: do not nest open blocks Date: Sat, 15 Dec 2018 12:27:40 +0100 Message-Id: <20181215112742.1475882-3-martin.agren@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181215112742.1475882-1-martin.agren@gmail.com> References: <20181215112742.1475882-1-martin.agren@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 It appears we try to nest open blocks, but that does not work well with Asciidoctor, which fails to indent the inner block. This causes the inner block to be set as if it had nothing to do with `--shared`. Drop the outer one. Asciidoc renders identically before and after this patch, both man-page and html. Signed-off-by: Martin Ågren --- See https://git-scm.com/docs/git-init#git-init---sharedfalsetrueumaskgroupallworldeverybody0xxx Documentation/git-init.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt index 3c5a67fb96..057076ca38 100644 --- a/Documentation/git-init.txt +++ b/Documentation/git-init.txt @@ -38,8 +38,6 @@ the repository to another place if --separate-git-dir is given). OPTIONS ------- --- - -q:: --quiet:: @@ -111,8 +109,6 @@ into it. If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created. --- - TEMPLATE DIRECTORY ------------------ From patchwork Sat Dec 15 11:27:41 2018 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: 10732167 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 BD0D717E9 for ; Sat, 15 Dec 2018 11:28:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA1682BFE1 for ; Sat, 15 Dec 2018 11:28:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F1B22BFFA; Sat, 15 Dec 2018 11:28:16 +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 3A54A2BFE3 for ; Sat, 15 Dec 2018 11:28:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730022AbeLOL2H (ORCPT ); Sat, 15 Dec 2018 06:28:07 -0500 Received: from mail-lj1-f196.google.com ([209.85.208.196]:37378 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729687AbeLOL2G (ORCPT ); Sat, 15 Dec 2018 06:28:06 -0500 Received: by mail-lj1-f196.google.com with SMTP id e5-v6so7094890lja.4 for ; Sat, 15 Dec 2018 03:28:05 -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=v2unD8Ccn9zHdGK2QLB6y4As0xFRgGXyjONU074gM9k=; b=YteGj5eMswr/XKF7malcQUF+3HPFP06OjHYSKInbfWCEyKoxbbQc2OJfCTdiwDoC2G dCUcxrMlOpKMFvBQnaiW+9OI3UBCsyF7n4lzhxglE1c6XAMW7S++ny1YN+/VhUu2SKC9 afImlqRRIromnD71UhpjymFj71NqH1eMweQvF42me072JPWtut6/d2VCDB3jn2BAD43L KYw0WXMFJuTxNujfnlGsX+kFpK/5OvfxUNYSsTa26qzVmwgy5h4J7DBkatwizbSAkwQ+ 1hsrkE7mCaick7p3ClQLcx+xg24mVi47DOXleYMAshuID/Ux6GGWl4OeVGKD+jS1huz2 Me0A== 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=v2unD8Ccn9zHdGK2QLB6y4As0xFRgGXyjONU074gM9k=; b=HSxT9CT6fXbj0Q5wQedK51S/6QDtgMmsA56cWpoY+YARY4pbtj5EbeLIrevLxjPG6W 9o7pFMKgJWigpPTNAWJTbUUihUKYYFkrtO9dUiItBgxrgKdU11Yjt2vLebslRsxxoW5T RCaG4BWCeGnFudcFwOVojxpRsZDz9oFG15kt6f1AZL4SyiM26zavmcgbkTlQU165c3u0 pzlnlOYOZrKRZugJqa0YzTiP0wRFtmnR5ohyhDaPSldnalb0L5eGsjwchQCseJgiRgrR kyz/x07oJwwa3vousP3xuPCzGh59FLqeaRG82bCHAePoL8nih9uNvuShCW+oB2/qmweS czGQ== X-Gm-Message-State: AA+aEWYltUMZ0MW3U7CQZBvBfj3QTVIn6ErhfePK+goCXEQz1yUvj5pE AC0QmAGZ2wnFmXL7EU+R1PsTrwHx X-Google-Smtp-Source: AFSGD/XkEBBUy0JM/n8rpsS5Rmj1MTrO0SI97f/V7n0ZTrtbsB1JJB579nusFKjxX/phNuGSmIUM6Q== X-Received: by 2002:a2e:914b:: with SMTP id q11-v6mr3566584ljg.164.1544873283983; Sat, 15 Dec 2018 03:28:03 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id t18sm1439174lft.93.2018.12.15.03.28.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Dec 2018 03:28:03 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 3/4] rev-list-options.txt: do not nest open blocks Date: Sat, 15 Dec 2018 12:27:41 +0100 Message-Id: <20181215112742.1475882-4-martin.agren@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181215112742.1475882-1-martin.agren@gmail.com> References: <20181215112742.1475882-1-martin.agren@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 Similar to the previous commit, it appears we try to nest open blocks, which does not work well with Asciidoctor. Drop the outer one. That fixes the indentation similar to the previous patch, and makes us stop rendering a literal '+' before "Under --pretty=oneline ...". Asciidoc renders identically before and after this patch, both man-page and html. Signed-off-by: Martin Ågren --- See https://git-scm.com/docs/git-log#git-log--g and https://git-scm.com/docs/git-rev-list#git-rev-list--g . The indentation doesn't look too bad, but the "+ Under" is clearly wrong. Documentation/rev-list-options.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index bab5f50b17..98b538bc77 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -13,8 +13,6 @@ has a line that matches ``), unless otherwise noted. Note that these are applied before commit ordering and formatting options, such as `--reverse`. --- - -:: -n :: --max-count=:: @@ -308,8 +306,6 @@ ifdef::git-rev-list[] `
` text will be printed with each progress update. endif::git-rev-list[] --- - History Simplification ~~~~~~~~~~~~~~~~~~~~~~ From patchwork Sat Dec 15 11:27:42 2018 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: 10732169 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 3C6BF13BF for ; Sat, 15 Dec 2018 11:28:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 29C662BFDD for ; Sat, 15 Dec 2018 11:28:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E6B72BFE3; Sat, 15 Dec 2018 11:28: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 5AD312BFDD for ; Sat, 15 Dec 2018 11:28:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730075AbeLOL2L (ORCPT ); Sat, 15 Dec 2018 06:28:11 -0500 Received: from mail-lf1-f66.google.com ([209.85.167.66]:33637 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729687AbeLOL2K (ORCPT ); Sat, 15 Dec 2018 06:28:10 -0500 Received: by mail-lf1-f66.google.com with SMTP id i26so6185647lfc.0 for ; Sat, 15 Dec 2018 03:28:08 -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=9BbX8e8GvoJsOoQqL7OyRUc9pMFW3aQMvAUT4kwbUsI=; b=aib2sEJE2bElwamVytYafGsrFyAUrTG9LG0imVoz1nxjFM3tc5nEdIhLTtUUdgStDn fm8zYtnZyk3TYiRRShWrGjmOqqxcOOgRhWWtZA7Ca9hDK1Yhoj3uWlbnMoF3uC7UoJDZ FbUkM4nslgFyIFgTw2832jj8EvfaiJTjEpX4GNYyddf1wrNuFwBK/rZXpbdd/dDrUymi FxLFhbeoRprsFRxilPGY89PIFzbiOHFLpG6MlZpvdkBAZzVu/uJNjmDetYatQqbM1mLz utLL6tnPlrDdCFp09TyTaqf1jgvKzXEL71bbn7kEA3xib/A+VFAR/mU8gd+13KxS//tv 6F2g== 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=9BbX8e8GvoJsOoQqL7OyRUc9pMFW3aQMvAUT4kwbUsI=; b=qbyNOQsM6fuoDTx6Y9WW6tdU7H4fR1rHKNBXs/QRT7gt7QNygET7DEDNiJKeYPUTsL 8MUJpvrVEE1O5nGLwdCCXTF83awFZDdz3h+CjViODqRpBBSy7nuQNJ0mq7G2+SVdlveZ Gj/hqcuhg7zG/OIwjFIO5RZrHQYG3e4miqiBWfOVU03iRn5oSpWw6pz5jFfNhRkZ2fju /3YNzDh3DxpEMGbuOXSf8CadSHefNjksTkiRdW0deVRSUMdV3i0OydA5JNcbg6Djom2/ jel5B4PeJeeYJt9Q7zN0x2dTKTiAqZ+G6DWVXHCsj/dHvVtmRPjfMs5ZQgJCieVxJtIS Fuug== X-Gm-Message-State: AA+aEWZ2eu7u0rPe72Q/ITJIsuR5cqAw1TGaii+3LHGQRpiEEoQPxJJb VZccfoRr2pDQD7KhrnYLiUWrUV7z X-Google-Smtp-Source: AFSGD/W0EgSxLPRAo3NSfuUENhXzawwyo84LzJcEZSlLAaXl+mex6opSNFpLFPkgf/xOQBOrV5EcIQ== X-Received: by 2002:a19:41c4:: with SMTP id o187mr3973772lfa.32.1544873285897; Sat, 15 Dec 2018 03:28:05 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id t18sm1439174lft.93.2018.12.15.03.28.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Dec 2018 03:28:05 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 4/4] git-status.txt: render tables correctly under Asciidoctor Date: Sat, 15 Dec 2018 12:27:42 +0100 Message-Id: <20181215112742.1475882-5-martin.agren@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181215112742.1475882-1-martin.agren@gmail.com> References: <20181215112742.1475882-1-martin.agren@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 Asciidoctor removes the indentation of each line in these tables, so the last lines of each table have a completely broken alignment. Similar to 379805051d ("Documentation: render revisions correctly under Asciidoctor", 2018-05-06), use an explicit literal block to indicate that we want to keep the leading whitespace in the tables. Because this gives us some extra indentation, we can remove the one that we have been carrying explicitly. That is, drop the first four spaces of indentation on each line. With Asciidoc (8.6.10), this results in identical rendering before and after this commit, both for git-status.1 and git-status.html. Signed-off-by: Martin Ågren --- See https://git-scm.com/docs/git-status#_short_format , https://git-scm.com/docs/git-status#_branch_headers and https://git-scm.com/docs/git-status#_changed_tracked_entries . Documentation/git-status.txt | 162 ++++++++++++++++++----------------- 1 file changed, 85 insertions(+), 77 deletions(-) diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index d9f422d560..861d821d7f 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -197,31 +197,33 @@ codes can be interpreted as follows: Ignored files are not listed, unless `--ignored` option is in effect, in which case `XY` are `!!`. - X Y Meaning - ------------------------------------------------- - [AMD] not updated - M [ MD] updated in index - A [ MD] added to index - D deleted from index - R [ MD] renamed in index - C [ MD] copied in index - [MARC] index and work tree matches - [ MARC] M work tree changed since index - [ MARC] D deleted in work tree - [ D] R renamed in work tree - [ D] C copied in work tree - ------------------------------------------------- - D D unmerged, both deleted - A U unmerged, added by us - U D unmerged, deleted by them - U A unmerged, added by them - D U unmerged, deleted by us - A A unmerged, both added - U U unmerged, both modified - ------------------------------------------------- - ? ? untracked - ! ! ignored - ------------------------------------------------- +.... +X Y Meaning +------------------------------------------------- + [AMD] not updated +M [ MD] updated in index +A [ MD] added to index +D deleted from index +R [ MD] renamed in index +C [ MD] copied in index +[MARC] index and work tree matches +[ MARC] M work tree changed since index +[ MARC] D deleted in work tree +[ D] R renamed in work tree +[ D] C copied in work tree +------------------------------------------------- +D D unmerged, both deleted +A U unmerged, added by us +U D unmerged, deleted by them +U A unmerged, added by them +D U unmerged, deleted by us +A A unmerged, both added +U U unmerged, both modified +------------------------------------------------- +? ? untracked +! ! ignored +------------------------------------------------- +.... Submodules have more state and instead report M the submodule has a different HEAD than @@ -281,14 +283,16 @@ don't recognize. If `--branch` is given, a series of header lines are printed with information about the current branch. - Line Notes - ------------------------------------------------------------ - # branch.oid | (initial) Current commit. - # branch.head | (detached) Current branch. - # branch.upstream If upstream is set. - # branch.ab + - If upstream is set and - the commit is present. - ------------------------------------------------------------ +.... +Line Notes +------------------------------------------------------------ +# branch.oid | (initial) Current commit. +# branch.head | (detached) Current branch. +# branch.upstream If upstream is set. +# branch.ab + - If upstream is set and + the commit is present. +------------------------------------------------------------ +.... ### Changed Tracked Entries @@ -306,56 +310,60 @@ Renamed or copied entries have the following format: 2 - Field Meaning - -------------------------------------------------------- - A 2 character field containing the staged and - unstaged XY values described in the short format, - with unchanged indicated by a "." rather than - a space. - A 4 character field describing the submodule state. - "N..." when the entry is not a submodule. - "S" when the entry is a submodule. - is "C" if the commit changed; otherwise ".". - is "M" if it has tracked changes; otherwise ".". - is "U" if there are untracked changes; otherwise ".". - The octal file mode in HEAD. - The octal file mode in the index. - The octal file mode in the worktree. - The object name in HEAD. - The object name in the index. - The rename or copy score (denoting the percentage - of similarity between the source and target of the - move or copy). For example "R100" or "C75". - The pathname. In a renamed/copied entry, this - is the target path. - When the `-z` option is used, the 2 pathnames are separated - with a NUL (ASCII 0x00) byte; otherwise, a tab (ASCII 0x09) - byte separates them. - The pathname in the commit at HEAD or in the index. - This is only present in a renamed/copied entry, and - tells where the renamed/copied contents came from. - -------------------------------------------------------- +.... +Field Meaning +-------------------------------------------------------- + A 2 character field containing the staged and + unstaged XY values described in the short format, + with unchanged indicated by a "." rather than + a space. + A 4 character field describing the submodule state. + "N..." when the entry is not a submodule. + "S" when the entry is a submodule. + is "C" if the commit changed; otherwise ".". + is "M" if it has tracked changes; otherwise ".". + is "U" if there are untracked changes; otherwise ".". + The octal file mode in HEAD. + The octal file mode in the index. + The octal file mode in the worktree. + The object name in HEAD. + The object name in the index. + The rename or copy score (denoting the percentage + of similarity between the source and target of the + move or copy). For example "R100" or "C75". + The pathname. In a renamed/copied entry, this + is the target path. + When the `-z` option is used, the 2 pathnames are separated + with a NUL (ASCII 0x00) byte; otherwise, a tab (ASCII 0x09) + byte separates them. + The pathname in the commit at HEAD or in the index. + This is only present in a renamed/copied entry, and + tells where the renamed/copied contents came from. +-------------------------------------------------------- +.... Unmerged entries have the following format; the first character is a "u" to distinguish from ordinary changed entries. u

- Field Meaning - -------------------------------------------------------- - A 2 character field describing the conflict type - as described in the short format. - A 4 character field describing the submodule state - as described above. - The octal file mode in stage 1. - The octal file mode in stage 2. - The octal file mode in stage 3. - The octal file mode in the worktree. -

The object name in stage 1. -

The object name in stage 2. -

The object name in stage 3. - The pathname. - -------------------------------------------------------- +.... +Field Meaning +-------------------------------------------------------- + A 2 character field describing the conflict type + as described in the short format. + A 4 character field describing the submodule state + as described above. + The octal file mode in stage 1. + The octal file mode in stage 2. + The octal file mode in stage 3. + The octal file mode in the worktree. +

The object name in stage 1. +

The object name in stage 2. +

The object name in stage 3. + The pathname. +-------------------------------------------------------- +.... ### Other Items