From patchwork Thu May 13 18:17:40 2021 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: 12256173 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C29C1C433ED for ; Thu, 13 May 2021 18:18:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 917EF61443 for ; Thu, 13 May 2021 18:18:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229994AbhEMSTR (ORCPT ); Thu, 13 May 2021 14:19:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229976AbhEMSTQ (ORCPT ); Thu, 13 May 2021 14:19:16 -0400 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0E85C061756 for ; Thu, 13 May 2021 11:18:05 -0700 (PDT) Received: by mail-lf1-x133.google.com with SMTP id a2so18763436lfc.9 for ; Thu, 13 May 2021 11:18:05 -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=jSMXV7gSzftX0Dt+we4xPj5RMpmc3MVy4YqVZiA/lsI=; b=vJKuk63cSNY6fTulE/XI7yp4MJTcN9H1HoSOP61PNQH0VCBspBEQTa2TWbgjvOJf3b x6xjva0qZKmw61+fjK/GgiBwW9w2FTER37fNEJbuNHSGRV8HwIOeNsPT6gQaUwKlLGiz QyIKiwj5TFndoZWJVgV31Vz5fZpkkKkwLNvlO/f1yLU1ReFXZ3jQyXbDP0/zrKT56EMx zdUjEKAfYrZRfKZIq8t8NsMkU4FEkThFV0Ag7rmG6x2KVeT6jejsnIhKMR+MHy5FaSmT dNHVkCrxwmR0zysE4Hz1fziggaK37sS2JwtPedBu4A7DXRcaVC0BnraR+SuIn0FUqNTa sbzg== 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=jSMXV7gSzftX0Dt+we4xPj5RMpmc3MVy4YqVZiA/lsI=; b=eXn8DiyQ2RpSyBkaEMY4/VQ4Gzjw2m9QvGGOZbYf0m4jpjitikwqwgWoDMzwVzENXG ZNpMiU6VVK+GpwOx3h7MnZZfvNhGj+uIXqn+OEHNsQpytrS4GwTCllD1FZwX4ocxTmNf 2U70gIaLJ55+P9H6nKrGd30TmEMst/7EE+M89ZYFAaXOhKGzp1rtE8cdwgtjmeKMghVx nlSUu7MczR22KNtOdS1gWDwuyRgle9vpALFv0FZaTgemd0lWJCOwo38Br4PG4j7jgep5 3r/tortChwuN1vte5nKUzVerKHVDPtGXgFwDeQlpQsLMWxn7P/L3XIqu7Vgbn9MXtrhL 8kFw== X-Gm-Message-State: AOAM531pExRyjkl3L8sZe16xyIn+9ADwY5gxyw5jpfGqqLYeg0+ujzfq Axcdfk5PwPrj6aCs/bub3qmjPa2QqHA= X-Google-Smtp-Source: ABdhPJzLDPJjS4ybRo1c/qNob8JdXrntisReY3bs4x7W/djukjbjoFGKo7XME6zDs9w2kdDrrOmCuQ== X-Received: by 2002:ac2:5b1a:: with SMTP id v26mr30022297lfn.534.1620929883900; Thu, 13 May 2021 11:18:03 -0700 (PDT) Received: from localhost.localdomain (81-231-136-235-no600.tbcn.telia.com. [81.231.136.235]) by smtp.gmail.com with ESMTPSA id v8sm554153ljn.17.2021.05.13.11.18.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 May 2021 11:18:03 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 1/6] git-http-push.txt,git-send-pack.txt: avoid single quote Date: Thu, 13 May 2021 20:17:40 +0200 Message-Id: <04e2d9de24db1e69803c495710f1f0908a12c91a.1620928059.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.31.1.751.gd2f1c929bd In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org AsciiDoc matches up the very first backtick with the single quote towards the end, and renders that first backtick literally: `--force, ... other peoples' commits Rewrite the "other peoples' commits" construction to drop the single quote mark. Signed-off-by: Martin Ågren --- Documentation/git-http-push.txt | 2 +- Documentation/git-send-pack.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt index ea03a4eeb0..cbb7d2de6d 100644 --- a/Documentation/git-http-push.txt +++ b/Documentation/git-http-push.txt @@ -85,7 +85,7 @@ Without `--force`, the ref is stored at the remote only if does not exist, or is a proper subset (i.e. an ancestor) of . This check, known as "fast-forward check", is performed in order to avoid accidentally overwriting the -remote ref and lose other peoples' commits from there. +remote ref and losing commits of other people from there. With `--force`, the fast-forward check is disabled for all refs. diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt index 44fd146b91..d8c8acb96e 100644 --- a/Documentation/git-send-pack.txt +++ b/Documentation/git-send-pack.txt @@ -144,7 +144,7 @@ Without `--force`, the ref is stored at the remote only if does not exist, or is a proper subset (i.e. an ancestor) of . This check, known as "fast-forward check", is performed in order to avoid accidentally overwriting the -remote ref and lose other peoples' commits from there. +remote ref and losing commits of other people from there. With `--force`, the fast-forward check is disabled for all refs. From patchwork Thu May 13 18:17:41 2021 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: 12256175 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52BA5C433ED for ; Thu, 13 May 2021 18:18:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2A9296143C for ; Thu, 13 May 2021 18:18:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230071AbhEMSTU (ORCPT ); Thu, 13 May 2021 14:19:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230025AbhEMSTS (ORCPT ); Thu, 13 May 2021 14:19:18 -0400 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22FD4C061574 for ; Thu, 13 May 2021 11:18:08 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id h4so39830508lfv.0 for ; Thu, 13 May 2021 11:18:08 -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=3JAUGaZY4L+xcoHGe7pjA6xDeg513QnrOLk3TH/OpgY=; b=KgBrMQh49nOAC0YlXGHGu5FIbt0wzyYZvH/O/WcBCiUkCHycK0Co+MUUN5sKLtNnBu x8Y0D40+TGBn6GaH+zBiYRpqs/KZFEmVZu/7ARjt2+ZDNBVkJ93uNK7mP5WtbnPWjY2j xbkO/Fku5EDDQEePA3uR4kCcaNB5CxS9FuzxKNhqHZkTsqH/hGkEYGd0jsQ9843roJyl WNHpzg2uptpM4H+QoHuTae7uagFFXvlDg/Z0zxDsTpflCSziYyCAa/QLwuPYBbIOLIbM RBvQpm/SqWnDm/0xpukhiuORKDA6/EXpzRuovoCEN8Ww/QK9uz9ZPdClReg3UHcpOLF/ Ya5Q== 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=3JAUGaZY4L+xcoHGe7pjA6xDeg513QnrOLk3TH/OpgY=; b=kUnBGpJXjjp4mLWCSCWi1PqRhvsK9lzPr6L0daB/85RPshBl8oqQE7SJ26l+jhWK7b wxM7iwBlDX6cqkOjXbl1YjtLNUMrmi5j3bf/v3hk8XvKlHVFK4CDsI6/MzBns0gqQkaf nsnKLv3etEKXXfG2mFjLmbI25eIozKCn+JYH0VDD71JF/aH/pHL1/8ZAzYzNqY6LY6JD +TXfu61bDtk5VZlD5l+3E2lqvoG4ozgcejTgRh6greU+MlB0bH2ZxmI9BKiCIdTLEd90 vaFZgmwGqFF+cJyPyxBAQ6L/zlglFSnyA1IOlEYBAq/AQb9DPY4ALYG/O9Csw6F+R3R5 9MlQ== X-Gm-Message-State: AOAM530g/Fna+rV/xoFQUKuvPXBeTpopR8M0uotdpA9Mcyfvd/ufNjxz NyUbckDeS7AQGMEYhQkNSZmMO1aVRsE= X-Google-Smtp-Source: ABdhPJymW7vx2827cKnQIPpqHW8A0D1wecxZq8U7yMS6mKgEWsHQNGipTB9dzHCZ68Iz0NA9ZdwQyA== X-Received: by 2002:ac2:592b:: with SMTP id v11mr746170lfi.296.1620929886367; Thu, 13 May 2021 11:18:06 -0700 (PDT) Received: from localhost.localdomain (81-231-136-235-no600.tbcn.telia.com. [81.231.136.235]) by smtp.gmail.com with ESMTPSA id v8sm554153ljn.17.2021.05.13.11.18.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 May 2021 11:18:05 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 2/6] git-range-diff.txt: avoid single quotes Date: Thu, 13 May 2021 20:17:41 +0200 Message-Id: <187b7290cfb516b957762e82538e64abda255cd3.1620928059.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.31.1.751.gd2f1c929bd In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Similar to the previous commit, the use of backticks for monospacing and a single quote as an apostrophe trip up AsciiDoc in two places which render as follows: `git range-diff ... diffs' coloring ‘1` is ... commits' patches Reword slighly to avoid those last single quotes. Signed-off-by: Martin Ågren --- Documentation/git-range-diff.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/git-range-diff.txt b/Documentation/git-range-diff.txt index fe350d7f40..6e9a0ea6b6 100644 --- a/Documentation/git-range-diff.txt +++ b/Documentation/git-range-diff.txt @@ -45,7 +45,7 @@ OPTIONS ------- --no-dual-color:: When the commit diffs differ, `git range-diff` recreates the - original diffs' coloring, and adds outer -/+ diff markers with + coloring of the original diffs, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added. + @@ -239,8 +239,8 @@ because of the modification: In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we -associate with every edge is the size of the diff between the two -commits' patches. To explain also new commits, we introduce dummy nodes +associate with every edge is the size of the diff between the patches of +the two commits. To explain also new commits, we introduce dummy nodes on both sides: ------------ From patchwork Thu May 13 18:17:42 2021 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: 12256177 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F9F7C43460 for ; Thu, 13 May 2021 18:18:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 66E616143E for ; Thu, 13 May 2021 18:18:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230031AbhEMSTY (ORCPT ); Thu, 13 May 2021 14:19:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230030AbhEMSTW (ORCPT ); Thu, 13 May 2021 14:19:22 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20BC5C061756 for ; Thu, 13 May 2021 11:18:12 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id h4so39830774lfv.0 for ; Thu, 13 May 2021 11:18:12 -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=xeerkNJmwffn34M2unVC4v8JjYe68qL1iP9GQYhGHqg=; b=WZ4fCxHrVyFwkl7z3/xGb8mkd3RqZwwvtI/Zk1w8E549QaCRDjfFqrPr7phXy7G/lx W6a886mWwncmiApQaXfB1e3b1Zl6D8Flzi+GGrj9bIanDbfa2rQPko26liOdjt1Xd6I9 SyKKyV2ClIK+UGkYOoJPvy3rkwKjYFT9UG7EgqGB16Yp6Db5ON8s/1tnKECEBFchCYKk tpbSotl2gMl7k22vLJlW8nTc+wG2FPSWftcUVBKAF6/xxalxZMnp05Po3AINSur+kX7c RJeAZkn8UmTSZvM3YuTokmIcxJTE5YmXBVVNypqgBPqKkYtR5PDCZZdWhfHeGHsBJFg6 +IVw== 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=xeerkNJmwffn34M2unVC4v8JjYe68qL1iP9GQYhGHqg=; b=KDETuZ8Ya1PA5B+0w1wKOfKPjpORyblr/816Zc4hs1EHwIJwz2MvYdeMpryFEjMYn3 Eap1e+bSdyuN0/STDqB1AwhgL9TFbEc1j5zPaWF76zZPh+FeklcryjK0Jq7RTVPEnCnU lyv5zUjnwWUtpNdzDJ9zMXiAs8OT/UJ+IP/rlWZIJLW66uzo5bkN/jZ1NkwSYHHjg+DQ KLzN5VoDWJGMcOfqQ0liEjfHafJ0CXkFMY1wC7OlKV+cguBG8jWjkmkoAmxDeICX6vx4 RIAp9b8QuOv08lPf8UaOXFvBIepteWP8KS+JulMj9wgXCphaz/xfVxmp/+brNQVxgvQf AH7g== X-Gm-Message-State: AOAM533Skm6/5tyTiSv4CXbklh1C2yQv3ZLHc8iDAY1fc25VGBxvpRRI SGBad9/y/wX9D3DKWx9jVVfSO+kDFwU= X-Google-Smtp-Source: ABdhPJwo/3gOM0nFQgJsVPWjNFDgg7hItqV1SydmYSqCkeSivUKoUsqxDjXduj6qQgOEjoIU7CCelA== X-Received: by 2002:a05:6512:11f0:: with SMTP id p16mr15176764lfs.520.1620929890304; Thu, 13 May 2021 11:18:10 -0700 (PDT) Received: from localhost.localdomain (81-231-136-235-no600.tbcn.telia.com. [81.231.136.235]) by smtp.gmail.com with ESMTPSA id v8sm554153ljn.17.2021.05.13.11.18.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 May 2021 11:18:09 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 3/6] git-check-ref-format.txt: avoid single quote Date: Thu, 13 May 2021 20:17:42 +0200 Message-Id: X-Mailer: git-send-email 2.31.1.751.gd2f1c929bd In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Asciidoctor renders 'git cat-file' with the single quotes. It's somehow tricked by the single quote in "srcref\'s" earler in the paragraph. If we drop the backslash, we'll regress with AsciiDoc. Let's just rewrite things a bit to avoid "srcref's" entirely. Add backticks for monospacing around these refs and command invocations while at it. Signed-off-by: Martin Ågren --- Documentation/git-check-ref-format.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt index ee6a4144fb..71d53ffb60 100644 --- a/Documentation/git-check-ref-format.txt +++ b/Documentation/git-check-ref-format.txt @@ -70,10 +70,10 @@ reference name expressions (see linkgit:gitrevisions[7]): . A tilde `~` and caret `^` are used to introduce the postfix 'nth parent' and 'peel onion' operation. -. A colon `:` is used as in `srcref:dstref` to mean "use srcref\'s - value and store it in dstref" in fetch and push operations. +. A colon `:` is used as in `srcref:dstref` to mean "use the value + of `srcref` and store it in `dstref`" in fetch and push operations. It may also be used to select a specific object such as with - 'git cat-file': "git cat-file blob v1.3.3:refs.c". + 'git cat-file': `git cat-file blob v1.3.3:refs.c`. . at-open-brace `@{` is used as a notation to access a reflog entry. From patchwork Thu May 13 18:17:43 2021 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: 12256179 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBF7BC433B4 for ; Thu, 13 May 2021 18:18:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A70666143E for ; Thu, 13 May 2021 18:18:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230093AbhEMST3 (ORCPT ); Thu, 13 May 2021 14:19:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230029AbhEMSTZ (ORCPT ); Thu, 13 May 2021 14:19:25 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF2B3C061574 for ; Thu, 13 May 2021 11:18:14 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id z9so39745395lfu.8 for ; Thu, 13 May 2021 11:18:14 -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=sTDTMk2ke/k5ktAyyxOoxZSf7pkA8knuG+qdVeb8XUY=; b=np3QTJWavGug1dggcuse7VwysSE+6bAkjOnkUA+8QhEdelm+tue+RJO8xn2uHpVSGM ZGTVj2wZARkv6K5HSFd9+EiY9WvhACCUC9rY1mbVqlzLI5SD2A3SMPLdl3thIG+aH+LY Q7b8JXIz3fYvy34J+GvIkMc1RUoQR5BmwsAWuIZKlY0T+XLG9u7nUS4TcD94ap4mLO5Z O913Qkp5Kl0V/CWt97I08QotgcZ/NwXShFDIxw9wWDRnUxhust7W/2qbfwEF5LtwWqw0 bmCW/zLGwAV8NIqWbJ6A+UTkX5AfXxobRcpMeAPjngotdTFLF75MiC6SkqSS3Spk+pmf aDfA== 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=sTDTMk2ke/k5ktAyyxOoxZSf7pkA8knuG+qdVeb8XUY=; b=tyYU+/zUNL08skIMK02tc7IcO1GkHf8cO59+hmSGXUyuLYi891gWYXPnsy98thlVIb 538yU6v//0EvRTUb8jhpWAZr6aaqAEhntqbTRrlgtjF1ceXW0iuhsJ4D3iJfv4UBCVUv sEAQBSzHHAu9HD8CHZgoY3xvlVcle77NGjitJ5IDm4yZ9vH64WSJga75pvkO7sgrv6yW IdAi1WSvBmMuNSOh1v3pu1Rj3k+rroRuO+poAm3LrbKczAP/wR0sELy2J4jlWXQ34dkU OF/ieQzckphAM5dl5bDD5A4wxw/aFd+ey9L+XJ2AcKlHYAIZGC3ojnjnZRJUdBzPlgMG HoYw== X-Gm-Message-State: AOAM533Uz3Y6iAHO2wMyhEJFpQ+jz471yQCftrMxEQsUeTnkE4Ar32k2 89Vx3njemdsjlBpwT1FHSJyh+IjHDAs= X-Google-Smtp-Source: ABdhPJxVHy5nmD7DFezIXREOysS1BAACbtDWzjNDCqePPQMh4OBGhEWFiEO+fvRnJp9iYwbzir5pbA== X-Received: by 2002:ac2:53a1:: with SMTP id j1mr28679129lfh.337.1620929893080; Thu, 13 May 2021 11:18:13 -0700 (PDT) Received: from localhost.localdomain (81-231-136-235-no600.tbcn.telia.com. [81.231.136.235]) by smtp.gmail.com with ESMTPSA id v8sm554153ljn.17.2021.05.13.11.18.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 May 2021 11:18:12 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 4/6] diff-options.txt: move monospace markup out of attribute Date: Thu, 13 May 2021 20:17:43 +0200 Message-Id: X-Mailer: git-send-email 2.31.1.751.gd2f1c929bd In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org git-log.txt and git-show.txt want to use different defaults for the `--no-diff-merges` option. They do this by defining a "diff-merges-default" attribute as, e.g., `off` (with backticks), which is then referenced in the common diff-options.txt. AsciiDoc renders the default in monospace, as wanted, but Asciidoctor renders the backticks literally. Pull the formatting into diff-options.txt and define "diff-merges-default" without any quotation or markup. We can't write `{diff-merges-default)` with backticks since that would render as "{diff-merges-default}", but we can use +{diff-merges-default}+ -- both Asciidoc and Asciidoctor do the substitution and the parsing of the plusses in the order we want. Signed-off-by: Martin Ågren --- Documentation/diff-options.txt | 2 +- Documentation/git-log.txt | 2 +- Documentation/git-show.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 530d115914..6eb8bfff5d 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -37,7 +37,7 @@ ifdef::git-log[] --diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc):: --no-diff-merges:: Specify diff format to be used for merge commits. Default is - {diff-merges-default} unless `--first-parent` is in use, in which case + +{diff-merges-default}+ unless `--first-parent` is in use, in which case `first-parent` is the default. + --diff-merges=(off|none)::: diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 1bbf865a1b..19560650bf 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -115,7 +115,7 @@ is when `--first-parent` is in use, in which case `first-parent` is the default format. :git-log: 1 -:diff-merges-default: `off` +:diff-merges-default: off include::diff-options.txt[] include::diff-generate-patch.txt[] diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt index 2b1bc7288d..f8341e51c0 100644 --- a/Documentation/git-show.txt +++ b/Documentation/git-show.txt @@ -51,7 +51,7 @@ The options below can be used to change the way `git show` generates diff output. :git-log: 1 -:diff-merges-default: `dense-combined` +:diff-merges-default: dense-combined include::diff-options.txt[] include::diff-generate-patch.txt[] From patchwork Thu May 13 18:17:44 2021 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: 12256181 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 653E1C433ED for ; Thu, 13 May 2021 18:18:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4895A613CA for ; Thu, 13 May 2021 18:18:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230029AbhEMSTg (ORCPT ); Thu, 13 May 2021 14:19:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230081AbhEMST1 (ORCPT ); Thu, 13 May 2021 14:19:27 -0400 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAB2EC06174A for ; Thu, 13 May 2021 11:18:17 -0700 (PDT) Received: by mail-lj1-x22b.google.com with SMTP id w15so34819412ljo.10 for ; Thu, 13 May 2021 11:18:17 -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=MwYdhQUMKM80wPh7YuwuNf+VaOf3JJj67pkQcNVle6s=; b=LHAUYi1+0ori0ucZ5xjtuvra/PIoqFFKh03dXoxJz/Ki2NT+NuArYtVfYSTGTnmbQR kWnJ9yBjjanPQmQ4g0hXYJS8T4+mgaAsyV1uoH76HLYKsrmSEo912Ovpfua2H6BYfocg 4LpYkW0FfyUQ2wu/6rfVUpH82i3G+zQaOFqRfGIJLCRSbXGBMTfudww+RfYmWqg0D0R+ G51SwLDUCJ8zijmWscSTKLEIp/xJUw+zK/aoJQDdkwXOB+IBIVSVkhAnhdwUGyiW9PQ3 qyUHXTxVhIUBpf/hlZklOJtIZrfzMmkk7Z4yNxzSvxu8DWJhskCPar/c5MRzoZhv6+r2 NFQw== 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=MwYdhQUMKM80wPh7YuwuNf+VaOf3JJj67pkQcNVle6s=; b=MthqiK1RkkbwtUCvyv7nvLkfg4KR7X2+B9j5E25NbFx7Aec/UBFOSx8mtOSocXOvu5 hxXz9eWvG/9+QABo9FP7CjmCBwYMkmrZDda+QMx2/UU3d+fVpnA3dDXTHyrV0tPc5M2G rDmKUTo+HAQgBgZFQwQVtWyPiktyJ6+Pdi4018uTNSnWxbyvcUFIWWRcJjrZ45t5lQI9 XcPmU9iCl5lNaPAFE16OPlYklPxqrFVLatf1S2LJcWoEJOvMpv4MxuUBfKSXBIkdvrxL CpJXuDMV/xQAkwPCjqJ6s+KYkXOf5RQ4gNsRyypA9obl0ngjJyqiAtgKKJy8cBIY/Eoy 0yDg== X-Gm-Message-State: AOAM530BEAK4wdNX4Cc+JfTnnc4fyYN1lFejZiRi8361qrMu3KMAWXvL gV9+bVKnCnaCCo9Y1jWvPtLxFwlyZU0= X-Google-Smtp-Source: ABdhPJyCYpfN8dYCFBgo2XSarVvyR23ilELorS+IBw3QcxRjp2z4tDMU0DS0pgtEdHZL7cXgYwFwHQ== X-Received: by 2002:a2e:9e57:: with SMTP id g23mr16268445ljk.123.1620929895787; Thu, 13 May 2021 11:18:15 -0700 (PDT) Received: from localhost.localdomain (81-231-136-235-no600.tbcn.telia.com. [81.231.136.235]) by smtp.gmail.com with ESMTPSA id v8sm554153ljn.17.2021.05.13.11.18.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 May 2021 11:18:15 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 5/6] git-svn.txt: change verse to listing block Date: Thu, 13 May 2021 20:17:44 +0200 Message-Id: <96c5a7ce800b37306274a6725ad44582fefb06a8.1620928059.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.31.1.751.gd2f1c929bd In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Unlike AsciiDoc, Asciidoctor seems to leave out an empty line after a verse in a list continuation: allow only certain refs. config key: svn-remote..ignore-refs If the ignore-refs configuration key is ... We could probably convince Asciidoctor do this differently, but thinking about it, there's no real reason for a "verse" here. We might as well use a listing block. This is the only place in our documentation that uses this "config key: foo.bar" construction. We could rework it into prose ("This option overrides the foo.bar configuration, which defaults to baz."). Right now, let's just solve the immediate issue of the missing empty line when we use Asciidoctor to generate the manpage. Signed-off-by: Martin Ågren --- Documentation/git-svn.txt | 45 ++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index d5776ffcfd..4e62dc37e7 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -148,8 +148,9 @@ the same local time zone. `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs. + -[verse] +------------ config key: svn-remote..ignore-refs +------------ + If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used. @@ -161,8 +162,9 @@ option is also given, both regular expressions will be used. (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. + -[verse] +------------ config key: svn-remote..ignore-paths +------------ + If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used. @@ -191,8 +193,9 @@ Skip "branches" and "tags" of first level directories;; 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`. + -[verse] +------------ config key: svn-remote..include-paths +------------ --log-window-size=;; Fetch log entries per request when scanning Subversion history. @@ -267,9 +270,10 @@ Use of 'dcommit' is preferred to 'set-tree' (below). reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit. + -[verse] +------------ config key: svn-remote..commiturl config key: svn.commiturl (overwrites all svn-remote..commiturl options) +------------ + Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use @@ -286,8 +290,9 @@ discouraged. branches, use a single space character between the branches (`--mergeinfo="/branches/foo:1-10 /branches/bar:3,5-6,8"`) + -[verse] +------------ config key: svn.pushmergeinfo +------------ + This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can @@ -548,9 +553,10 @@ Assume you have local changes in "master", but you need to refetch "r2". Fix the ignore-paths or SVN permissions problem that caused "r2" to be incomplete in the first place. Then: + -[verse] +------------ git svn reset -r2 -p git svn fetch +------------ + ------------ r1---r2'--r3' remotes/git-svn @@ -562,8 +568,9 @@ Then fixup "master" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'! + -[verse] +------------ git rebase --onto remotes/git-svn A^ master +------------ + ------------ r1---r2'--r3' remotes/git-svn @@ -608,8 +615,9 @@ removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git. + -[verse] +------------ config key: svn.rmdir +------------ -e:: --edit:: @@ -619,8 +627,9 @@ Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects. + -[verse] +------------ config key: svn.edit +------------ -l:: --find-copies-harder:: @@ -629,9 +638,10 @@ config key: svn.edit They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information. + -[verse] +------------ config key: svn.l config key: svn.findcopiesharder +------------ -A:: --authors-file=:: @@ -648,8 +658,9 @@ will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation. + -[verse] +------------ config key: svn.authorsfile +------------ --authors-prog=:: If this option is specified, for each SVN committer name that @@ -664,8 +675,9 @@ relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'. + -[verse] +------------ config key: svn.authorsProg +------------ -q:: --quiet:: @@ -704,8 +716,9 @@ creating the branch or tag. 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string. + -[verse] +------------ config key: svn.useLogAuthor +------------ --add-author-from:: When committing to svn from Git (as part of 'set-tree' or 'dcommit' @@ -714,8 +727,9 @@ config key: svn.useLogAuthor Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits. + -[verse] +------------ config key: svn.addAuthorFrom +------------ ADVANCED OPTIONS ---------------- @@ -749,8 +763,9 @@ ADVANCED OPTIONS process. This feature is enabled by default, use --no-follow-parent to disable it. + -[verse] +------------ config key: svn.followparent +------------ CONFIG FILE-ONLY OPTIONS ------------------------ From patchwork Thu May 13 18:17:45 2021 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: 12256183 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9DB1DC43460 for ; Thu, 13 May 2021 18:18:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 79589613CA for ; Thu, 13 May 2021 18:18:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230113AbhEMSTl (ORCPT ); Thu, 13 May 2021 14:19:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230030AbhEMSTd (ORCPT ); Thu, 13 May 2021 14:19:33 -0400 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77BECC061574 for ; Thu, 13 May 2021 11:18:20 -0700 (PDT) Received: by mail-lj1-x235.google.com with SMTP id 131so9439518ljj.3 for ; Thu, 13 May 2021 11:18:20 -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=uifB8NJeojaeK+nDmSVKQhtY0qawzOshRrAWtqB0FD8=; b=ns8Z2ODQFzkk/cuekNI4kTjwUpQVwLHCw8oKwqTuZzGjwxIilhnl0ZKLhG4Tiw4wwx Sqp45Ygomj+yS5zadDrSBvgz/96jHJ0W28XoAUaTqc4EQm9MdwDhOTPLIneairRxW2Zj 8jvCnSnqWuMUUYMT8Mvfeg3tq9YPDZrESAD9YPbKat3oMjQ1oJ+IuQIfTJ+ls/4bhwoG cavDFTwrz8Arz/8dV6KdCwmKM3W4ER7EiEpGMQqa9CmJbumAdKILJLtRq59es56ZEJfm ykCRonw1QdoJOascobTRWcUJrx7+9+AApg6OJlr+hcO8hejSl41h55TfUQxn1yYGdii0 SILw== 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=uifB8NJeojaeK+nDmSVKQhtY0qawzOshRrAWtqB0FD8=; b=E8ITfL25Pd6NHRF5cdUB0IEwNJnA889jd1TPQrwfU2PZThJmA+VYAVn10RTM3v8WDa 2NlnGpg5QDPyaFTFVQhwDTZsWTmhbOPrmYFac6HupW0hzH+q+cFWkUnGVRAS4dDgtze1 5cXg+pi+zNN4OBqugNvoRKRY30vRGH3sKKtPYWKs1AN+up7V1UKN+x+XJK44yfIx2rO8 Jmk/+LENnA3E4cDV3Dmc122Siwo1uZhgB9Y+vPUGD+5olpY739WSq1sTAlqKyXQGwewP 3vO+a+SyERqG5sxW8D+jR2qGBSYMncpXU/Vq9Y2v/yv/15t8nDAubuIOG6tloIp6hDzS mJRA== X-Gm-Message-State: AOAM532THDIUTu9tdYq9wKuUdsp6tuL5Fn6XG3yaFEmRz1KGjdCDftaz /zS3rO/KDQzNHrHh9fT84Y0QeA6c1vg= X-Google-Smtp-Source: ABdhPJytbe/tB/KBRxikSmWM0v+Lo8fB0NVhqPelBzP2f7IgJIHBxApFOLz6mbM/ecS4vzwqaOnxJw== X-Received: by 2002:a2e:9806:: with SMTP id a6mr17880966ljj.214.1620929898656; Thu, 13 May 2021 11:18:18 -0700 (PDT) Received: from localhost.localdomain (81-231-136-235-no600.tbcn.telia.com. [81.231.136.235]) by smtp.gmail.com with ESMTPSA id v8sm554153ljn.17.2021.05.13.11.18.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 May 2021 11:18:18 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH 6/6] Doc: use two backticks for monospace, not backtick+apostrophe Date: Thu, 13 May 2021 20:17:45 +0200 Message-Id: X-Mailer: git-send-email 2.31.1.751.gd2f1c929bd In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In a few places, we wrap the name of an --option or an ENV_VARIABLE in backtick+apostrophe rather than backtick+backtick. Switch to using two backticks, as per the coding guidelines. As an added bonus to rendering these as monospace, we will have them render the same with AsciiDoc and Asciidoctor. The `quoted' way ends up as ‘quoted’ vs “quoted”. Signed-off-by: Martin Ågren --- Documentation/config/diff.txt | 2 +- Documentation/git-check-ignore.txt | 2 +- Documentation/git-describe.txt | 2 +- Documentation/git-svn.txt | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt index 2d3331f55c..eda0c452d1 100644 --- a/Documentation/config/diff.txt +++ b/Documentation/config/diff.txt @@ -69,7 +69,7 @@ diff.interHunkContext:: diff.external:: If this config variable is set, diff generation is not performed using the internal diff machinery, but using the - given command. Can be overridden with the `GIT_EXTERNAL_DIFF' + given command. Can be overridden with the `GIT_EXTERNAL_DIFF` 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 diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt index 0c3924a63d..ab97ee9d50 100644 --- a/Documentation/git-check-ignore.txt +++ b/Documentation/git-check-ignore.txt @@ -21,7 +21,7 @@ input files to the exclude mechanism) and output the path if it is excluded. By default, tracked files are not shown at all since they are not -subject to exclude rules; but see `--no-index'. +subject to exclude rules; but see `--no-index`. OPTIONS ------- diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt index a88f6ae2c6..adbbb8907f 100644 --- a/Documentation/git-describe.txt +++ b/Documentation/git-describe.txt @@ -44,7 +44,7 @@ OPTIONS HEAD". If the working tree has local modification "-dirty" is appended to it. If a repository is corrupt and Git cannot determine if there is local modification, Git will - error out, unless `--broken' is given, which appends + error out, unless `--broken` is given, which appends the suffix "-broken" instead. --all:: diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 4e62dc37e7..2491ed47a6 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -361,7 +361,7 @@ where is the name of the SVN repository as specified by the -R option to This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers. + -The following features from `svn log' are supported: +The following features from `svn log` are supported: + -- -r [:];; @@ -397,7 +397,7 @@ Any other arguments are passed directly to 'git log' 'blame':: Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of - `svn blame' by default. Like the SVN blame command, + `svn blame` by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'. @@ -482,7 +482,7 @@ denotes such an object, or it is requested by invoking an editor (see 'info':: Shows information about a file or directory similar to what - `svn info' provides. Does not currently support a -r/--revision + `svn info` provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field.