From patchwork Sun Dec 16 14:28:57 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: 10732511 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 8BEA913BF for ; Sun, 16 Dec 2018 14:29:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B52829A7D for ; Sun, 16 Dec 2018 14:29:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6CB8829A88; Sun, 16 Dec 2018 14:29:28 +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 230B329A7D for ; Sun, 16 Dec 2018 14:29:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730746AbeLPO3Z (ORCPT ); Sun, 16 Dec 2018 09:29:25 -0500 Received: from mail-lf1-f67.google.com ([209.85.167.67]:33579 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730181AbeLPO3Z (ORCPT ); Sun, 16 Dec 2018 09:29:25 -0500 Received: by mail-lf1-f67.google.com with SMTP id i26so7588094lfc.0 for ; Sun, 16 Dec 2018 06:29:24 -0800 (PST) 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=fdDJBj1CZtWY5lGyjQGrYnUE5q36bo0XfoqNOL5iwxo=; b=eEsOPCymO1nmC+jxm1TH9Qa+TTQ8I5K9rqqx1krKnmukF9TgI5JwecJcLPCjpuV5yb aQUKLzSH9LFzF4YdTKAWcCL1FsVxYI50hJb2pRBtWeOVfWcuT+xov4mOeHQUixnCQWme mckw0aqsYyC0qminX8q6f6m78lgUr6Z2NK2vh1+CSseP9YT1vzeN19j6ZJK3TarT5n94 VLaZvWbBnUqRf9+UYABqkp7Y3Lh+NZrm+GNcyHQnlhAcSznpTdVGkc3fet1IwJWe17i3 V9c2Bjt/GV0YQMFOyd7s/kiiqLq3hS8YPy8Q99/tWOpKnqneAGFlSteYhk4wrASFmkRW v9Rw== 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=fdDJBj1CZtWY5lGyjQGrYnUE5q36bo0XfoqNOL5iwxo=; b=iZnDbAqX4uYGxjgn0ApkMZnU1+Isa6JzugzrkIQez/hZ1ZF93lASVaO9u7hFrxgXxG IW0YZ6LJaqeN53fYMIHPeUXMnnwN81PtHpr3cipRnhp8ZMXZ9oe1HLhnmH+51T9xRAfK gjEmEGZPs1q6qBKIv0XdGbs7k9ENr2WEAA9iXb+TMOIvJV7EiS2PY3m9r8XIcA7Ed8Tl 8k508/15jdvNHIxGsF5liLo0b8SJmILxZFY2ptm380gALJfHuND8d87VfTwDZ1EPH6yU yIkXlHi73FEszgwulsFM65yxTxbrQo82pe0rRw018AlfKoxi7rZpaXdG84tR12t0MjhY bU4w== X-Gm-Message-State: AA+aEWb47vzd1LgqJ8M5O3IHP4mvZ0oJ85sqASFZzI/5sj3gYYz/IjfX icGMio75eAx2N8nEbzSfIrx7w/u0 X-Google-Smtp-Source: AFSGD/Wln6ad45AejdDd7q8LnzxvnjdpjYbAhq+iiiH+qjo2KTok4U5ZF4kYMT+Y2Ybr+2TgjxRlgA== X-Received: by 2002:a19:4ed9:: with SMTP id u86mr5190675lfk.78.1544970562962; Sun, 16 Dec 2018 06:29:22 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id k63sm2083296lfe.13.2018.12.16.06.29.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Dec 2018 06:29:22 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Jeff King Subject: [PATCH v2 1/3] git-column.txt: fix section header Date: Sun, 16 Dec 2018 15:28:57 +0100 Message-Id: <0177869f73d2c69b33862f60febc3988c22b1fa8.1544969984.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: <20181216105944.GG13704@sigill.intra.peff.net> 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. Instead, it thinks we are starting a code listing block, which ends up containing the remainder of the document. The result is quite ugly. Make sure we have as many dashes as we have characters in "Examples". Asciidoc renders identically before and after this patch, both man-page and html. Signed-off-by: Martin Ågren --- 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 Sun Dec 16 14:28:58 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: 10732513 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 1901513BF for ; Sun, 16 Dec 2018 14:29:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 090A429A7D for ; Sun, 16 Dec 2018 14:29:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F0D0A29A88; Sun, 16 Dec 2018 14:29:31 +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 9D73529A7D for ; Sun, 16 Dec 2018 14:29:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730751AbeLPO32 (ORCPT ); Sun, 16 Dec 2018 09:29:28 -0500 Received: from mail-lf1-f67.google.com ([209.85.167.67]:42467 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730181AbeLPO32 (ORCPT ); Sun, 16 Dec 2018 09:29:28 -0500 Received: by mail-lf1-f67.google.com with SMTP id l10so7555396lfh.9 for ; Sun, 16 Dec 2018 06:29:27 -0800 (PST) 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=bQ/eZxl2Xzr5kNU7ICQuzJqtb8pMQOosITUAMwwbjAI=; b=eCEdlUsSOeppuxGhsojlb+4pxos5/OmYCJAY9ZFbqKNJl+yY5b2RaZzleqbuscmXJL 8QuLIBrklAkB/cAp60bSKDWoIXkW/NoiBwJCi0RbspoWQZVzBDdycX2kEhq6mABE5FaD WuW39TET74ZnTcGKhOkfpYmjeO8Wrc6GowO0AefgdW5mp78MB4WB5ToDLebTXF+xHrri u4jUP/oDsHZhwPOmfXVr1xwzq4KbvcsAnRPwTiSn91y53yfSEzcYqWQFgGQfqx4aFDaU VFIn5kXdnxBMFAt8xBk3N0rYjFTwmyeBJbzIfjvSLH1Lh2cvybE966L5F10A2oNq+nZd MdNA== 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=bQ/eZxl2Xzr5kNU7ICQuzJqtb8pMQOosITUAMwwbjAI=; b=mhoDTIYCKgcjIfolVz5Bqk3wE+J1+MmqXdBdu8KS1epBxDfdqf0/RPiHduFs5rCaN3 TmvOm8VdjBYEp3OGc17VBcwf8uvxuGyCTcX73RgIh73xsaIC9iKzkmm7vvgmcpWO2zgM qpvxNtrflyjNMJCZgeLiTMUVevfdjuHGF+wiBn8DcEC8aedeIXhTZEqToxMxvsIjei/h zIPAt39u6qlhiQzTLGiZEwrApvSuVaXwS6g3GQlKLgn+6/ze0pLohUc4djumRCJxEbda yFXv7y1wZfMehhhKZ0/Jj297FYJdb41r4qx4hD+mzO9k/Zpc4jIoofdKsy5SdlEXIB9J 1/dw== X-Gm-Message-State: AA+aEWaeUlNArAgs/1qB5+rLfrH1sNARk+YrfOw0bFJlkIeaRr8O6bt+ 5q0OgNnRSYdzsULjK0p2phC28iAW X-Google-Smtp-Source: AFSGD/W0I2v07D50Y1R3Bkv6HnRJ5ZR8nCzN06+efPtQ1zZf6C3zE82ZbXDBRcXiUQ+a0vWr1vBfGw== X-Received: by 2002:a19:c954:: with SMTP id z81mr5204212lff.150.1544970565719; Sun, 16 Dec 2018 06:29:25 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id k63sm2083296lfe.13.2018.12.16.06.29.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Dec 2018 06:29:25 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Jeff King Subject: [PATCH v2 2/3] Documentation: do not nest open blocks Date: Sun, 16 Dec 2018 15:28:58 +0100 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: <20181216105944.GG13704@sigill.intra.peff.net> 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 blocks. As a result, they do not visually seem to relate (as much) to the preceding paragraph as they should. Drop the outer blocks to fix the rendering of the inner ones. Asciidoc renders identically before and after this patch, both man-pages and html. This also makes Asciidoctor stop rendering a literal '+' before "Under --pretty=oneline ..." in the manuals for git-log and git-rev-list. Signed-off-by: Martin Ågren --- Documentation/git-init.txt | 4 ---- Documentation/rev-list-options.txt | 4 ---- 2 files changed, 8 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 ------------------ 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 Sun Dec 16 14:28:59 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: 10732515 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 93ED16C5 for ; Sun, 16 Dec 2018 14:29:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82CC629A7D for ; Sun, 16 Dec 2018 14:29:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 76FF829A88; Sun, 16 Dec 2018 14:29: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 B494629A7D for ; Sun, 16 Dec 2018 14:29:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730754AbeLPO3c (ORCPT ); Sun, 16 Dec 2018 09:29:32 -0500 Received: from mail-lf1-f67.google.com ([209.85.167.67]:42468 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730181AbeLPO3c (ORCPT ); Sun, 16 Dec 2018 09:29:32 -0500 Received: by mail-lf1-f67.google.com with SMTP id l10so7555423lfh.9 for ; Sun, 16 Dec 2018 06:29:29 -0800 (PST) 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=pXABqcjWT+ewhtaZYYeXwDDPimGmYxsXNXKaRicM2Fw=; b=d8+NrXlxziDqYvA431fdd7/WOUNLYFtT5r/TTgOjZxfOSlUgAgPurZDkk+mAeUWQiq m03lvKWKE6uowzwAIQIw1qfMh3d3PHyJe1xW/1F2Jor9O1a+fWHbH2UqBEHHQ597qJ0k PwF4mOFWexFk+dNn8P2XQuekQet28SrUOehzwlZqSIXezsSfIVjmgxf782AsunR7iDCW l8iEACEXTzVncpq0OvCfhDlvdesvNQDxRcpElgOPLOW4nT8g5mWwvexNBRRhmu/P1ZV1 shR4LufUim73g5aaVwDGVZxPjjn8BI3vJUgmc4N6b5StKEuhIAas4OOBONqEUz2HpNI1 fHVA== 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=pXABqcjWT+ewhtaZYYeXwDDPimGmYxsXNXKaRicM2Fw=; b=pMjHX9h9VGiAtgvaQuPelJ5bIng/mdaxEvG0oDA2NVNUr3UKjQdh5K1aBPb+OQvykx OcexxkaGayLau0JBkGk7SThPExDCUYAuaycm2n4nhwwocwCMwJaNOiHRnHW2hdo1zqzf xLLVd0nb2Sl/pecrVhqa95sm80rAgm6kHsD6Psc2gQngVjnurGoI7h5JU6HTgh8ZA5OQ Y2iV9iTmpQs1ZBW/3D4oeYxFWRUb8ZmyX7t4NNyATYmGSnfqHLO5aMtLtw3ZAsZGak8t yp8qgISQHpoL/o8Sbp1DtAT2qHc2R21uGWq956DVt3MnaeDnpoMsBSo2YmlRcql3S1yh VFkw== X-Gm-Message-State: AA+aEWYIjyeCUvOa8afP/YPvGKBKwVxlBTD+5SfEwIq5+7+mhxZttCIR CkfDTtwyztPqD/cZUq5suHAWawwR X-Google-Smtp-Source: AFSGD/Uen1+p6XCIdK4OmIc/EstGmrMXGE5h0F04L25vJvdAwiYX1tasjJf2ZCPyFVDhlfDKZ4PTCg== X-Received: by 2002:a19:4cc3:: with SMTP id z186mr5245052lfa.37.1544970568481; Sun, 16 Dec 2018 06:29:28 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id k63sm2083296lfe.13.2018.12.16.06.29.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Dec 2018 06:29:27 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Jeff King Subject: [PATCH v2 3/3] git-status.txt: render tables correctly under Asciidoctor Date: Sun, 16 Dec 2018 15:28:59 +0100 Message-Id: <2cca954957c5b9c750e6d2211b673997effe7d60.1544969984.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: <20181216105944.GG13704@sigill.intra.peff.net> 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 --- 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