From patchwork Sun Sep 20 11:22:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 11787451 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 88168174A for ; Sun, 20 Sep 2020 11:22:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6F4EB216C4 for ; Sun, 20 Sep 2020 11:22:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JZihDyNd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726402AbgITLWr (ORCPT ); Sun, 20 Sep 2020 07:22:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726267AbgITLWk (ORCPT ); Sun, 20 Sep 2020 07:22:40 -0400 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B49A6C0613CE for ; Sun, 20 Sep 2020 04:22:39 -0700 (PDT) Received: by mail-pf1-x443.google.com with SMTP id b124so6515164pfg.13 for ; Sun, 20 Sep 2020 04:22:39 -0700 (PDT) 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=BBM6Z4UFUqbzxzSnSnByRwvr2Y6v7sMzlGe/goEffBw=; b=JZihDyNdKA3iWZu3gGX9wOERV45ZUZiGvyNkLxwqM9V5LeoEEpgJCAITiSuorNCsUn yQJoy3Dulxfjtv3GWZHv+V9SQ9Me2gjM8bqYKEkg8VqdzeQVyu4cfVV8bA7EjkgSGuCr ZaXF82FOgshholxI/RR/BTA1G/OSL9cPW0fWvNtXiCoEQ4CgHSbmVjB6q0A97TJRhaCk LdUiTsVU5jczph60zeFdVY5gYp/s721CZPgPL0dbhPc2z7O62YhVKI6W1yYaFjqa3co8 tZQ3xlP+LcVKTGUVQtmIw6xB75VkGWK3vrAKuWl7d57ocxCYWpgi0JVWKguoCtEHZjmP 6cew== 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=BBM6Z4UFUqbzxzSnSnByRwvr2Y6v7sMzlGe/goEffBw=; b=aDT2cVVEvvyfVRNL/dFxilRUF65cr3I87bnep6xEcRoIARYm1NveYXlZwfKb4PzejW qnPjXJRBOoYeqh7d+j2/Qe6LAZoZVanyWmmH0D3UFxXUTEzyLbnJT6p/1ySey+OxH0VH T96n+czJ+/ABcwy+w4Qrz+6AG7rLIdnucNJ4eDFVtaYoWdZLUNTRooMAtsjFbED83ew+ Q1C8t0+qqF8jSn5ekg7u2UvyiI/I8+gPuy0JhTyalKSDvMTDovhp3Vzi3vf57AVb9ilg KH5NPWVp0VxLu/LfmVktizkLka8SD0RonokduIpReae9V6gqBhQ3dFc16WgFPLqQKpfJ LvVA== X-Gm-Message-State: AOAM533mrd6reGhlMuW2Ai+VM7iFOdCnJ5lBErSy+8+f2N/7z5sH3vH8 lUWXvhvYPAORqctSCuYF80K4blZrBK4= X-Google-Smtp-Source: ABdhPJwT5F4+249tFYgGIODZwGTZbcjPZbR23+r4vmiDYl1Z31ndBJ+gB6e+GclNw687VTh83M9CWg== X-Received: by 2002:aa7:8ec7:0:b029:13e:d13d:a080 with SMTP id b7-20020aa78ec70000b029013ed13da080mr38329133pfr.23.1600600959018; Sun, 20 Sep 2020 04:22:39 -0700 (PDT) Received: from archbookpro.hsd1.ca.comcast.net ([2601:647:4201:c540::414c]) by smtp.gmail.com with ESMTPSA id y79sm9550737pfb.45.2020.09.20.04.22.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Sep 2020 04:22:38 -0700 (PDT) From: Denton Liu To: Git Mailing List Cc: Junio C Hamano , Jeff King Subject: [PATCH v4 03/10] git-diff.txt: backtick quote command text Date: Sun, 20 Sep 2020 04:22:20 -0700 Message-Id: X-Mailer: git-send-email 2.28.0.760.g8d73e04208 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The modern way to quote commands in the documentation is to use backticks instead of double-quotes as this renders the text with the code style. Convert double-quoted command text to backtick-quoted commands. While we're at it, quote one instance of `^@`. Signed-off-by: Denton Liu --- Documentation/git-diff.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 727f24d16e..8f7b4ed3ca 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -68,13 +68,13 @@ files on disk. This form is to view the results of a merge commit. The first listed must be the merge itself; the remaining two or more commits should be its parents. A convenient way to produce - the desired set of revisions is to use the {caret}@ suffix. + the desired set of revisions is to use the `^@` suffix. For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`. 'git diff' [] .. [--] [...]:: - This is synonymous to the earlier form (without the "..") for + This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary . If on one side is omitted, it will have the same effect as using HEAD instead. @@ -83,20 +83,20 @@ files on disk. This form is to view the changes on the branch containing and up to the second , starting at a common ancestor - of both . "git diff A\...B" is equivalent to - "git diff $(git merge-base A B) B". You can omit any one + of both . `git diff A...B` is equivalent to + `git diff $(git merge-base A B) B`. You can omit any one of , which has the same effect as using HEAD instead. Just in case you are doing something exotic, it should be noted that all of the in the above description, except -in the last two forms that use ".." notations, can be any +in the last two forms that use `..` notations, can be any . For a more complete list of ways to spell , see "SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]. However, "diff" is about comparing two _endpoints_, not ranges, -and the range notations (".." and -"\...") do not mean a range as defined in the +and the range notations (`..` and +`...`) do not mean a range as defined in the "SPECIFYING RANGES" section in linkgit:gitrevisions[7]. 'git diff' [] :: @@ -144,9 +144,9 @@ $ git diff HEAD <3> + <1> Changes in the working tree not yet staged for the next commit. <2> Changes between the index and your last commit; what you - would be committing if you run "git commit" without "-a" option. + would be committing if you run `git commit` without `-a` option. <3> Changes in the working tree since your last commit; what you - would be committing if you run "git commit -a" + would be committing if you run `git commit -a` Comparing with arbitrary commits:: +