From patchwork Sun May 17 18:52:16 2020 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: 11554245 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CC19B912 for ; Sun, 17 May 2020 18:52:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B4F6E207F9 for ; Sun, 17 May 2020 18:52:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SmWw6Ynw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726301AbgEQSwf (ORCPT ); Sun, 17 May 2020 14:52:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726269AbgEQSwe (ORCPT ); Sun, 17 May 2020 14:52:34 -0400 Received: from mail-lf1-x141.google.com (mail-lf1-x141.google.com [IPv6:2a00:1450:4864:20::141]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F0EBC061A0C for ; Sun, 17 May 2020 11:52:34 -0700 (PDT) Received: by mail-lf1-x141.google.com with SMTP id x27so5970385lfg.9 for ; Sun, 17 May 2020 11:52:34 -0700 (PDT) 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=UDDy15KOhZVRdLG9nEUOXBdRcAWX1wCCsMxIiwnlYog=; b=SmWw6YnwulUGZyeDagM4HqCwQEtWRPVfTuv02RfiagaTGSnF2bBHVm1gYOZySE/LWb dgad/bm2N3Q5fCwoV1UEEcu5fExXt39x0Vl4vFCgcGsEjacDAAfPcH8brV452xXz8+Vc XAo8grMBCfnTyAnnJxQEP+a+MTOkKH6czpHxrMsuMautQbtI+xLJ0V063WFgDue+/Vkq zaerNuw09c7Ts7mOd1tGYmbyO2rkalq6F/2rFU8kH/CCA6J4pmoVIMO0eT6AfxKytcru 2OFMWxCjdJo4GXGRtU0FJcHCPSnPiQbOesQV1Co3M60MJur/GRwwxZpcwrK+Vwy0Z52v oUdg== 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=UDDy15KOhZVRdLG9nEUOXBdRcAWX1wCCsMxIiwnlYog=; b=EuVJX7jLs4jn3hfQ5ueRNrAwUO9u10MgFrN2n6Orr9vQ9PQrl9kIbdc8wbBXzPFeSq nxqGbVlaruuZh9CNgYcCb4qdEIEMikUS8VW30CgOBEa4r+gj3kjchARxIH8dxYGsA0+j rUaWIucsGFd9CC4tdUyERCII/fwqfTtE4QyzmTpaUgwLGlNkSJtAbKbWev3jfxYmH+7n rX+H5Dh+UJLPPxk7lUZo9f4YnLaEUWfhDHYOc32x610HE9+eY86nxysiEgIFIbzMwse+ AvUz3NtnHYxnXEtWZ2k6s/ToiYjoGH2vmW9jtskO0wuf2xobvvTrOxYVLTWHgUUNVi3e xF2A== X-Gm-Message-State: AOAM5311JNnJP75SnpQPHZ+aebsaWO7Gpq4tQxmaHyYENQhEbke4Ljmd Lw2b1UtExzyJ8iNAsluO75f2/Woo X-Google-Smtp-Source: ABdhPJxQPwSOh2ishVFYf4nfCVzkNdYZL1eZaZ5NNBhgRC6OqHyo9gQi5uTDX32ma1NdOBH+nvhpXg== X-Received: by 2002:a19:990:: with SMTP id 138mr4093868lfj.135.1589741552340; Sun, 17 May 2020 11:52:32 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id a12sm4513938ljj.64.2020.05.17.11.52.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 11:52:31 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 1/7] date-formats.txt: fix list continuation Date: Sun, 17 May 2020 20:52:16 +0200 Message-Id: <63c07d03a471addff3e98bb7ec669f7224cf6e24.1589739920.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.27.0.rc0 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 The blank line before the lone "+" means it isn't detected as a list continuation, but instead renders literally, at least with AsciiDoc. Drop the empty line and, while at it, add a closing period to the preceding paragraph. Signed-off-by: Martin Ågren --- Documentation/date-formats.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Documentation/date-formats.txt b/Documentation/date-formats.txt index 7e7eaba643..f1097fac69 100644 --- a/Documentation/date-formats.txt +++ b/Documentation/date-formats.txt @@ -22,8 +22,7 @@ ISO 8601:: `2005-04-07T22:13:13`. The parser accepts a space instead of the `T` character as well. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as - `2005-04-07T22:13:13` - + `2005-04-07T22:13:13`. + NOTE: In addition, the date part is accepted in the following formats: `YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`. From patchwork Sun May 17 18:52:17 2020 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: 11554247 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 095C5912 for ; Sun, 17 May 2020 18:52:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E5E7C20809 for ; Sun, 17 May 2020 18:52:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jjD693q/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726362AbgEQSwh (ORCPT ); Sun, 17 May 2020 14:52:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726269AbgEQSwg (ORCPT ); Sun, 17 May 2020 14:52:36 -0400 Received: from mail-lf1-x144.google.com (mail-lf1-x144.google.com [IPv6:2a00:1450:4864:20::144]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28AAEC061A0C for ; Sun, 17 May 2020 11:52:36 -0700 (PDT) Received: by mail-lf1-x144.google.com with SMTP id c12so2629183lfc.10 for ; Sun, 17 May 2020 11:52:36 -0700 (PDT) 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=/tOlumivPrtndi0Yw/zXNc++fLoP3hbuwF9Rup9nmE8=; b=jjD693q/9HVZaLRRf3p4g+DtUrJiLP3zQ+3TbrTMfyzL0GP3s7CTPPNz/WtfrnblM8 nKbOaJ9CxVfxE3Ok4NyVnx7+W9zhZvb+PBi21yGJQR05KldA0GPpKC9uUx2Akp8B6qYK 5cmJaWwLVSHDwOw6YSvTX3oLJj9N7eKgDr73jUNk2rKY1Q7ohFJ1WGBEJ5gDVKy+Easi /q9RiksjZxANF6oD86FgbnYCFDb2x294IUEXAIYI3rxmSBv0LRiuqCVZaxtlnLgJVO8J KVUCWo1Xuc9PGg2BAUgciS+STSSaEiEYeifien/rro8EsDu/scHn57EVcDLiodCqVEIj Gfyg== 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=/tOlumivPrtndi0Yw/zXNc++fLoP3hbuwF9Rup9nmE8=; b=dpQBhe7u25cSihVO0I6jpcmXnfrFRQ2UA9VCtoEeuoVHMBG11JT2T5k3J/4O6jO6ft ageRxaTU1RiRuEFiRRMC5Wn0XTp7d7EqVnw6yzSrE0EtrQRAPBY/rhTY0g4hfp2nY41h izv5POGvs8Bj7geIQml29HWdGVTClTtBgN/ptxb3zg+pTuvleprvtWAGTsneDDXNvJbD fBn5yRodefmuacxpgpxbKwslYoPijduS3BvesbzA0Y2dNAGPwMRupcZ03554jx/DbRJP y9oL6B4t0DAIagINM3yQhbzUYL4vrco0sVHpsi0qblsKLwoe8zwPNZOm2G0FPCc6mK/v 92Mg== X-Gm-Message-State: AOAM530r/lUBc1SQOZ3qZkoiS6e7PmIlFdYyFVgZwGPetyFYu3ebbovI Sve8VTomAG99QNVLorpTa9l+DFLj X-Google-Smtp-Source: ABdhPJzqTlU7FqLjNuydfL9MZZTrtsc2y67LTrDAgFyM/Mqi5SVe4szKFGzPiHPWK0GnedAHCPdD5g== X-Received: by 2002:a19:6b13:: with SMTP id d19mr9268264lfa.126.1589741554420; Sun, 17 May 2020 11:52:34 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id a12sm4513938ljj.64.2020.05.17.11.52.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 11:52:34 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 2/7] git-bugreport.txt: fix reference to strftime(3) Date: Sun, 17 May 2020 20:52:17 +0200 Message-Id: <4753804d23ba7b1b267b6557077c80f3a8891712.1589739920.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.27.0.rc0 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 When we say "link:strftime[3]", it ends up rendered as "3[1]" and we produce a footnote referring to the non-existing file:///.../git-doc/strftime. Make sure we use gitlink, not link, to get the effect we're after. Signed-off-by: Martin Ågren --- Documentation/git-bugreport.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-bugreport.txt b/Documentation/git-bugreport.txt index 7fe9aef34e..5ee9988628 100644 --- a/Documentation/git-bugreport.txt +++ b/Documentation/git-bugreport.txt @@ -46,7 +46,7 @@ OPTIONS --suffix :: Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-'. This should take the form of a - link:strftime[3] format string; the current local time will be used. + linkgit:strftime[3] format string; the current local time will be used. GIT --- From patchwork Sun May 17 18:52:18 2020 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: 11554249 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 83F8B912 for ; Sun, 17 May 2020 18:52:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6BA95207F9 for ; Sun, 17 May 2020 18:52:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AkNEx+4E" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726388AbgEQSwk (ORCPT ); Sun, 17 May 2020 14:52:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726269AbgEQSwj (ORCPT ); Sun, 17 May 2020 14:52:39 -0400 Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF4A7C061A0C for ; Sun, 17 May 2020 11:52:37 -0700 (PDT) Received: by mail-lj1-x241.google.com with SMTP id b6so7529826ljj.1 for ; Sun, 17 May 2020 11:52:37 -0700 (PDT) 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=Bd5HGQCrM1JbTkDwfeEOZ6TB0lawENQ0GxN5Vy/VDs4=; b=AkNEx+4EYTETVzbe/fjAraSOzZCRHhyvLLaxqyM2t7qS7GgmP67AIepw/owjY8KJKa 8XEhBK5axjCEZDCZJtMCPrwP1/skhttLZfO/3AFCHglPs+gboqQZ/Yed9/CXnhDCXWXD NiNJkYIdGD5F/PNCKp2OfTgyZom2HVgt64SOjPFbDgOXWPfICBuLZw2SEOrISkJGSQe1 tYOMgm5egxfvQF7IRXGSij40Je2ccKMMKiwWZKC+1S5NbCs05gs1z2mlcgb0yTxsjF16 lgPbYcwP1AoCmTX4Rd5uYRCitzPQFygjAKYRclKRAMHcKJOTjrecvbU/hLn8R4mFJ8uU ovSQ== 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=Bd5HGQCrM1JbTkDwfeEOZ6TB0lawENQ0GxN5Vy/VDs4=; b=ADJGyzQVy+1DBdekGq2dbneZCNE3SvDI6QEpnIdP0znBQOxtFtyVBIgH82XtijQKcg y0qGpGyhR9DxpYK6n2WktmQV/NV6R9yCh9F8rr941eJse+rU2G7ITDuovvOLy/S3ZbAH Qc9Xf6+fGNmWahPtQ9wC8VWiJ2D1Hehk6WnhV9bpyECOMntOZFgJqg8N9pqv6SQm8U39 r0EkYbH442RcetDG/RQZqRdAvItGGWvlncauGPunW8XzvkAGY7Bu6MkvhEYolXIQ1MGX wG6asBEcTWFezQIC0HgexNiLSXtlPGDEirgP/+w/E6NEG7AaNeg/QrcBlQeOlGUn1ojQ WyZw== X-Gm-Message-State: AOAM533IPjCWbTokO6J3NsTM3xlCObnQk//sYTcr6i/4s1AwDs/q8/7k cobmebljGCbZIxHcC3qkV9KFKep5 X-Google-Smtp-Source: ABdhPJw7AAzTP/bHgsp7vNGTr+IBrEUCSrXQmJ2QMhTw81hYPBBonRChcxUzW1sNsADZHda/Av5qmg== X-Received: by 2002:a2e:3a10:: with SMTP id h16mr7635061lja.49.1589741556186; Sun, 17 May 2020 11:52:36 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id a12sm4513938ljj.64.2020.05.17.11.52.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 11:52:35 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 3/7] git-commit-graph.txt: fix grammo Date: Sun, 17 May 2020 20:52:18 +0200 Message-Id: X-Mailer: git-send-email 2.27.0.rc0 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 It's easy to mix up the possessive "its" and "it's" ("it is"). Correct an instance of this. Signed-off-by: Martin Ågren --- Documentation/git-commit-graph.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-commit-graph.txt b/Documentation/git-commit-graph.txt index 53a650225a..258bf66e46 100644 --- a/Documentation/git-commit-graph.txt +++ b/Documentation/git-commit-graph.txt @@ -58,7 +58,7 @@ With the `--append` option, include all commits that are present in the existing commit-graph file. + With the `--changed-paths` option, compute and write information about the -paths changed between a commit and it's first parent. This operation can +paths changed between a commit and its first parent. This operation can take a while on large repositories. It provides significant performance gains for getting history of a directory or a file with `git log -- `. + From patchwork Sun May 17 18:52:19 2020 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: 11554251 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1330914C0 for ; Sun, 17 May 2020 18:52:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F0FB420809 for ; Sun, 17 May 2020 18:52:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WDqSCfTp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726426AbgEQSwk (ORCPT ); Sun, 17 May 2020 14:52:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726379AbgEQSwj (ORCPT ); Sun, 17 May 2020 14:52:39 -0400 Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A627C05BD09 for ; Sun, 17 May 2020 11:52:39 -0700 (PDT) Received: by mail-lj1-x244.google.com with SMTP id g4so7510679ljl.2 for ; Sun, 17 May 2020 11:52:39 -0700 (PDT) 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=Er+dHkjc6+xU4AZGe2v6wWOdFj2LQijbrsg2btGs4tU=; b=WDqSCfTpCxoIP20kLm5fqczuyTwuCy3AAT19A10GEvhu1n9LvGAlt7l5xNoxiO3tGM bKv3Iy0TC2fe0P6tVpYlSOGGo5fvJNWKcL0Ys5VxzmPBvTEa/cRYGa2IdgutS2enpsNF rxOui04GajP49Vl8PCu7+LRiXT4UXGshsj3F7Ut4ajWXXrHBCiEiZ23ZdeuQM7ht/gCG Sm+1656mq8k2aJi2tis6rd4BZI95Njy8rdz706OCGY+UCZ6HpwoMDspkG8Pq4eofiS8Z gMfFTi6dUxIBSgLiy9bFvQrzWq4cG5AwaNMK2GO7/F6ChTQrP5x0Fi2iY2HkzjlrP10a aKyA== 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=Er+dHkjc6+xU4AZGe2v6wWOdFj2LQijbrsg2btGs4tU=; b=tFJvqGAvN+5DopHtAmbAPSDiVLqVeGXkTYh86nTjhUkrkQwBeqKSPvdz2iRL+NkWm+ ZLE4NQG8HhnRk84+hHbn/7hkqOXAS75P0UlfPR4bOSE7qZEPwHelQ5XRj2hyGE4+BSsh giB7Ghf3yORcswIpSICYtP7nNRk2xT/vCjyWe56foFjXVni2Vd8rWuBOjQQqS9zLLHMb giX6tPK+ATfu9UeSr4wn4rJWHfehww6CPjuU8TEzUoPoNjKznrRrFqYdCgUNi/+1yQpy eudDXfEzE1ZXlzvE7XmsMoju4LUByFc8ZluUcXvNaCGPDkYTfSYwXisKHX/JNWJFIn45 ApRQ== X-Gm-Message-State: AOAM53240r/aR4e+6hbJq4gMmOIcMDk4xJ38ISK+If0oqK+BRgcum3MO Cv7NnfjTYW87XphN5QDNdFOtYpiz X-Google-Smtp-Source: ABdhPJxZfY1OexONkAwIJcIOLOkLnMA5vd3Y/9D47GTCrV7s/4pMdXd2TGtsZ5W6zyDOd0o0KvzZWA== X-Received: by 2002:a05:651c:1035:: with SMTP id w21mr8198248ljm.278.1589741557719; Sun, 17 May 2020 11:52:37 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id a12sm4513938ljj.64.2020.05.17.11.52.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 11:52:37 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 4/7] git-commit-graph.txt: fix list rendering Date: Sun, 17 May 2020 20:52:19 +0200 Message-Id: <8203fc4c118eb3bd18e0632ffb9e1a618ae383c7.1589739920.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.27.0.rc0 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 The first list item follows immediately on the paragraph where we introduce the list. This makes the "*" render literally as part of one huge paragraph. (With AsciiDoc, everything is fine after that, but with Asciidoctor, we get some minor follow-on errors.) Add an empty line -- with a list continuation ("+") -- to make the first list item render ok. Signed-off-by: Martin Ågren --- Documentation/git-commit-graph.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/git-commit-graph.txt b/Documentation/git-commit-graph.txt index 258bf66e46..a3d996787b 100644 --- a/Documentation/git-commit-graph.txt +++ b/Documentation/git-commit-graph.txt @@ -68,6 +68,7 @@ chain of multiple commit-graph files stored in strategy and other splitting options. The new commits not already in the commit-graph are added in a new "tip" file. This file is merged with the existing file if the following merge conditions are met: ++ * If `--split=no-merge` is specified, a merge is never performed, and the remaining options are ignored. `--split=replace` overwrites the existing chain with a new one. A bare `--split` defers to the remaining From patchwork Sun May 17 18:52:20 2020 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: 11554253 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 436D014C0 for ; Sun, 17 May 2020 18:52:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2CD3B207F9 for ; Sun, 17 May 2020 18:52:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZMgP8O+Q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726448AbgEQSwm (ORCPT ); Sun, 17 May 2020 14:52:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726379AbgEQSwl (ORCPT ); Sun, 17 May 2020 14:52:41 -0400 Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1333AC061A0C for ; Sun, 17 May 2020 11:52:41 -0700 (PDT) Received: by mail-lj1-x243.google.com with SMTP id h4so7489525ljg.12 for ; Sun, 17 May 2020 11:52:40 -0700 (PDT) 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=b1KtnYrkGGuHIRR6rIFGW+8WNtxmMn+llFfLEufUagc=; b=ZMgP8O+Q+n6+g3/LaCunrSFHWsPDgi/STudsXuBgZXmwJvjU7cWg8ATd1typumQB3t CpzTCn2/v2yyKuPVnUJhMoJaOSn/L4dVUddjKrkFvmmCPmgZnLuvYJQD8ev5aln71SNP cMQfpeFYPa2P7VwJbqMDH5XWclVss63tt54z7fD4jKXLc1r4l/QQKePDqsrzs+E1W4p6 hYeCXgQTRyROU8XIvB5EE6jbIHgSYlgrkVX7A4LOVd5aNKfGCeCeO7jWByffChg1fNEw kg33jwYCsjWCj60wA7WH/QKdHsFbLjkMSUDqwaXeQu+jZheR6LXdEYRa8qYlqzr2ty73 8NbA== 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=b1KtnYrkGGuHIRR6rIFGW+8WNtxmMn+llFfLEufUagc=; b=s8Kht8IqbWiEETUUHwZixPkFdiZOFNbXSLxtsjGo5g15rzqW56zrXYp0FupOyyjNPz 4S/PTr4rppjfZaDua5T2FUcr04186pC2OtQWOLi3iwwapaeOpwV7BU1cmeNDmnqvzDVO 9kcjNPLNvZaP2sD5yQF2iDb1ioFKG79nxh07galjfHrm6tT6W/TqsXVGka+2NjybuU4I CHEztO1Yd2iRJfvuACG5YgnedZulgwXYR75qmBihssQFwxYZmRnC19n/vVmRHG9pmy5u kWqygdaTy408iYqfqXYn0s5aVhKePMInWyJCuDTvFZAV7dWc8Ojoo6iVHEjPLN/uzMOZ BqFA== X-Gm-Message-State: AOAM531EuCL0Ka7auL1wHR6/QE/4TRd1wAye6cBelSg4/8u5DUvQRl8C vy6q0RCYbM/T16SaHPt4eOBAcSlW X-Google-Smtp-Source: ABdhPJzjuRHOvMsR5+S40HXuxWQ8JpBBWP84nvhY+YMzuyt+9BMci2mp6/3qiJ5tSccHJQqRId/vNw== X-Received: by 2002:a05:651c:50e:: with SMTP id o14mr8401479ljp.52.1589741559306; Sun, 17 May 2020 11:52:39 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id a12sm4513938ljj.64.2020.05.17.11.52.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 11:52:38 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 5/7] git-credential.txt: use list continuation Date: Sun, 17 May 2020 20:52:20 +0200 Message-Id: X-Mailer: git-send-email 2.27.0.rc0 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 Use list continuation to avoid the second and third paragraphs rendering with a different indentation from the first one where we describe the "url" attribute. Signed-off-by: Martin Ågren Reviewed-by: Carlo Marcelo Arenas Belón --- Documentation/git-credential.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/git-credential.txt b/Documentation/git-credential.txt index 8d990e92fd..31c81c4c02 100644 --- a/Documentation/git-credential.txt +++ b/Documentation/git-credential.txt @@ -151,11 +151,11 @@ Git understands the following attributes: were read (e.g., `url=https://example.com` would behave as if `protocol=https` and `host=example.com` had been provided). This can help callers avoid parsing URLs themselves. - - Note that specifying a protocol is mandatory and if the URL - doesn't specify a hostname (e.g., "cert:///path/to/file") the - credential will contain a hostname attribute whose value is an - empty string. - - Components which are missing from the URL (e.g., there is no - username in the example above) will be left unset. ++ +Note that specifying a protocol is mandatory and if the URL +doesn't specify a hostname (e.g., "cert:///path/to/file") the +credential will contain a hostname attribute whose value is an +empty string. ++ +Components which are missing from the URL (e.g., there is no +username in the example above) will be left unset. From patchwork Sun May 17 18:52:21 2020 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: 11554255 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8003B912 for ; Sun, 17 May 2020 18:52:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 695D6207F9 for ; Sun, 17 May 2020 18:52:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GQGwJuMw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726551AbgEQSwn (ORCPT ); Sun, 17 May 2020 14:52:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726379AbgEQSwm (ORCPT ); Sun, 17 May 2020 14:52:42 -0400 Received: from mail-lf1-x141.google.com (mail-lf1-x141.google.com [IPv6:2a00:1450:4864:20::141]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70A72C061A0C for ; Sun, 17 May 2020 11:52:42 -0700 (PDT) Received: by mail-lf1-x141.google.com with SMTP id d22so6077967lfm.11 for ; Sun, 17 May 2020 11:52:42 -0700 (PDT) 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=wWZQakPEeDnzQU9pihMZL8Ee9K8pJXtTIG6pyxpCETE=; b=GQGwJuMw8TdosztcOQv7e+Lyh/4pYubBmpH9KrEPyzsUuI++eLxD3rvVeEugRvO4eT 22RS1sPJQenCi9egsXCsZzbBLes2MBlcaVk/dGDa6Y8ca8pVqHpXWvwF7eYc6GmcLrH2 t2mDRASxw+KvHqqbb8OxDB+aIdA26GMzD0ylIDspJj5hDSo48RpzSsxK+X2rOVWqgeRd g0lWwR4PnOm2vnnBZfSl5R044LF2zdY5QwKYFBD1ZwzF7awMlvnszNlaAgGAhgdxI2LO Zw+lYfgVDyIPETmFX71Qr8AAnrN4OTh6c+qDXf3exvlz8FtbLRARFGpKfHl2dJJHCgXQ FgdA== 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=wWZQakPEeDnzQU9pihMZL8Ee9K8pJXtTIG6pyxpCETE=; b=cptKINzW3pt5Os0WP+aPulnfoCZY5FO3XycchYE06axGg3Ky1pwbPwr8NrrI3wgAiM eYEHpOMnjMUqf+FotXbPu01qG7CvVKIhzR33HQy1du+pTxG4GCxGnn4Uwc54otz/TcIt mX9ExW8C09km0UwVo4/dVog33UEY3YwnaBW1tztxoeJ0L+0OsPKOULGFc1EAfpqbMq3b bpaE0K5zQw7nu2HkzC599/HSSHwNOe9To1/ua74HAlzkCfVB/aKbGo6rZCehLLrmbgQd npbTYIi+g05RBdbfAXPvtoD6/l2VAc2FjiI76m/qWU766Ggq8Ui375ff9vrTdob4OlYC vxng== X-Gm-Message-State: AOAM5301SOxLqWFvJR94LgQWBeGv3B1rstbhSoWisV52k3nsEi2xFmVD xAyuHLvqxpSnW2ZafUtIJbN4ggDW X-Google-Smtp-Source: ABdhPJzQSLNzg5ck9eJBoco9lEtLHMN99C/ESvMMu1Uj1KGvcpQV3VDzdiGVjqFMtTIw1jbOz5LBOA== X-Received: by 2002:a19:bc4:: with SMTP id 187mr9177132lfl.211.1589741560741; Sun, 17 May 2020 11:52:40 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id a12sm4513938ljj.64.2020.05.17.11.52.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 11:52:40 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 6/7] git-sparse-checkout.txt: add missing ' Date: Sun, 17 May 2020 20:52:21 +0200 Message-Id: <69faf4d317547143f455321c5a70575cb7b0b0ad.1589739920.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.27.0.rc0 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 Where we explain the 'reapply' command, we don't properly wrap it in single quote marks like we do with the other commands: We omit the closing mark ("'reapply") and this ends up being rendered literally as "'reapply". Add the missing "'". Signed-off-by: Martin Ågren --- Documentation/git-sparse-checkout.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-sparse-checkout.txt b/Documentation/git-sparse-checkout.txt index 1a3ace6082..7c8943af7a 100644 --- a/Documentation/git-sparse-checkout.txt +++ b/Documentation/git-sparse-checkout.txt @@ -70,7 +70,7 @@ C-style quoted strings. `core.sparseCheckoutCone` is enabled, the given patterns are interpreted as directory names as in the 'set' subcommand. -'reapply:: +'reapply':: Reapply the sparsity pattern rules to paths in the working tree. Commands like merge or rebase can materialize paths to do their work (e.g. in order to show you a conflict), and other From patchwork Sun May 17 18:52:22 2020 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: 11554257 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AF947912 for ; Sun, 17 May 2020 18:52:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 954B120809 for ; Sun, 17 May 2020 18:52:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Mk0cx1GD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726559AbgEQSwp (ORCPT ); Sun, 17 May 2020 14:52:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726379AbgEQSwo (ORCPT ); Sun, 17 May 2020 14:52:44 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 322FDC061A0C for ; Sun, 17 May 2020 11:52:44 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id h188so6106426lfd.7 for ; Sun, 17 May 2020 11:52:44 -0700 (PDT) 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=BcnMfFsie4+0a9z8QgeBFHu3FahSzZ79Vc+CfMx5ITs=; b=Mk0cx1GDvjIwtYhRuk2WRvI4MC2BB97V9JRWO64PHlqSzowHu2kyXfFNEbMo5HEWZl Slk+RTxSIy5pchl+2LNyHXqIBtufaBsJqyqBb+HuCZNO+PvFjxds5KrX8BA82//TLmld vIwGlBCuewsbMJcPyjY/wvLPF88VLCJK2gQnskt37cVY9Y0h6QirwTxYIaNJQrqDjrX7 gpJBu3KyPBtCfvMd0DloUFnFBXrT8OgNGl3xp8tddycT4eLGWxay9+FnTNmFnSwlSgdO AFvtDKOzlENrP4d9H4yVGWmQHqrwMldLVjM12CSMvANCXrExtg/kZGFaZZMJk6TQt1Kz g6sg== 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=BcnMfFsie4+0a9z8QgeBFHu3FahSzZ79Vc+CfMx5ITs=; b=JR1QCIVvnGjS12/np+yIfPLKXcSRAngGa3oq1NwIQR5phi7r2ZYi2JpAFEccpHm39e 753L8itQ6nZE03AGPCNgmmHKy1D7ogJ+bxswvcBZgdq2xcpzp5uwnZjV6MvmPswn1kFa lV8EAAV0nQRLL14Wx310bigHqxybwbxXDTIL8TUeYQ7UWtNhjs+rd1Wy4RomKNhIOEaR q4btwkKS+aHp723jxfiBA9pguGIuS8NZkOWI04QmL6eOXonTSDAACdAl0YOG/Io4z2cX nrW3r1B8pYM6kLDKUnU4Ykd8a78PjMHbjK0Ae8D6eFk0AT9gwMtYWvdXZZrKPvT/RYbv Xuug== X-Gm-Message-State: AOAM5329MWIdWNHiQDkY0Awb+XyLvooCrQFTg4p8hIIWTuXLDPJWBk/x 1cn5NjUeemEa2/Hf1wyKyRzxxYlj X-Google-Smtp-Source: ABdhPJxXmyFo31oPnDfO+pV3Ne4nOjNU2cN1kOH7xRwFM4XnaT2RjKA+QTh6+3OmN+gaci4cNyNIzw== X-Received: by 2002:a19:c895:: with SMTP id y143mr8723212lff.199.1589741562207; Sun, 17 May 2020 11:52:42 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id a12sm4513938ljj.64.2020.05.17.11.52.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 11:52:41 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 7/7] rev-list-options.txt Date: Sun, 17 May 2020 20:52:22 +0200 Message-Id: X-Mailer: git-send-email 2.27.0.rc0 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 The explanation of the `--show-pulls` option added in commit 8d049e182e ("revision: --show-pulls adds helpful merges", 2020-04-10) consists of several paragraphs and we use "+" throughout to tie them together in one long chain of list continuations. Only thing is, we're not in any kind of list, so these pluses end up being rendered literally. The preceding few paragraphs describe `--ancestry-path` and there we *do* have a list, since we've started one with `--ancestry-path::`. But we don't have a similar list running here. We could tie all our paragraphs from 8d049e182e to that list, but that doesn't make much sense: We aim to describe another option entirely. We could start a new list item: --show-pulls: Before discussing another option, `--show-pulls`, we need to create a new example history. + ... That reads somewhat awkwardly to me. Not to mention that the chain of paragraphs that follows is fairly long, introducing a new example history and discussing it in quite some detail. Let's make this run along without any kind of indentation. It effectively means that we're treating "Before discussing..." as a paragraph on the same level as "There is another simplification mode available:" which precedes the `--ancestry-path::` list. If we really want a `--show-pulls::` list somewhere, we could perhaps let it begin around "The `--show-pulls` option helps with both of these issues ..." further down. But for now, let's just focus on getting rid of those literal pluses. Signed-off-by: Martin Ågren Signed-off-by: Derrick Stolee --- Documentation/rev-list-options.txt | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 04ad7dd36e..48e37e2456 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -581,12 +581,12 @@ option does. Applied to the 'D..M' range, it results in: Before discussing another option, `--show-pulls`, we need to create a new example history. -+ + A common problem users face when looking at simplified history is that a commit they know changed a file somehow does not appear in the file's simplified history. Let's demonstrate a new example and show how options such as `--full-history` and `--simplify-merges` works in that case: -+ + ----------------------------------------------------------------------- .-A---M-----C--N---O---P / / \ \ \/ / / @@ -595,7 +595,7 @@ such as `--full-history` and `--simplify-merges` works in that case: \ / /\ / `---X--' `---Y--' ----------------------------------------------------------------------- -+ + For this example, suppose `I` created `file.txt` which was modified by `A`, `B`, and `X` in different ways. The single-parent commits `C`, `Z`, and `Y` do not change `file.txt`. The merge commit `M` was created by @@ -607,19 +607,19 @@ the contents of `file.txt` at `X`. Hence, `R` is TREESAME to `X` but not contents of `file.txt` at `R`, so `N` is TREESAME to `R` but not `C`. The merge commits `O` and `P` are TREESAME to their first parents, but not to their second parents, `Z` and `Y` respectively. -+ + When using the default mode, `N` and `R` both have a TREESAME parent, so those edges are walked and the others are ignored. The resulting history graph is: -+ + ----------------------------------------------------------------------- I---X ----------------------------------------------------------------------- -+ + When using `--full-history`, Git walks every edge. This will discover the commits `A` and `B` and the merge `M`, but also will reveal the merge commits `O` and `P`. With parent rewriting, the resulting graph is: -+ + ----------------------------------------------------------------------- .-A---M--------N---O---P / / \ \ \/ / / @@ -628,21 +628,21 @@ merge commits `O` and `P`. With parent rewriting, the resulting graph is: \ / /\ / `---X--' `------' ----------------------------------------------------------------------- -+ + Here, the merge commits `O` and `P` contribute extra noise, as they did not actually contribute a change to `file.txt`. They only merged a topic that was based on an older version of `file.txt`. This is a common issue in repositories using a workflow where many contributors work in parallel and merge their topic branches along a single trunk: manu unrelated merges appear in the `--full-history` results. -+ + When using the `--simplify-merges` option, the commits `O` and `P` disappear from the results. This is because the rewritten second parents of `O` and `P` are reachable from their first parents. Those edges are removed and then the commits look like single-parent commits that are TREESAME to their parent. This also happens to the commit `N`, resulting in a history view as follows: -+ + ----------------------------------------------------------------------- .-A---M--. / / \ @@ -651,18 +651,18 @@ in a history view as follows: \ / / `---X--' ----------------------------------------------------------------------- -+ + In this view, we see all of the important single-parent changes from `A`, `B`, and `X`. We also see the carefully-resolved merge `M` and the not-so-carefully-resolved merge `R`. This is usually enough information to determine why the commits `A` and `B` "disappeared" from history in the default view. However, there are a few issues with this approach. -+ + The first issue is performance. Unlike any previous option, the `--simplify-merges` option requires walking the entire commit history before returning a single result. This can make the option difficult to use for very large repositories. -+ + The second issue is one of auditing. When many contributors are working on the same repository, it is important which merge commits introduced a change into an important branch. The problematic merge `R` above is @@ -671,26 +671,26 @@ important branch. Instead, the merge `N` was used to merge `R` and `X` into the important branch. This commit may have information about why the change `X` came to override the changes from `A` and `B` in its commit message. -+ + The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it "pulled" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is: -+ + ----------------------------------------------------------------------- I---X---R---N ----------------------------------------------------------------------- -+ + Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history. -+ + When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information: -+ + ----------------------------------------------------------------------- .-A---M--. N / / \ / @@ -699,7 +699,7 @@ graph includes all of the necessary information: \ / / `---X--' ----------------------------------------------------------------------- -+ + Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it "pulled" the change `R` into the main