From patchwork Tue Aug 4 00:55:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Sunshine X-Patchwork-Id: 11699353 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 94115913 for ; Tue, 4 Aug 2020 00:56:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AC5102073E for ; Tue, 4 Aug 2020 00:56:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ukQOFBCe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728519AbgHDA4a (ORCPT ); Mon, 3 Aug 2020 20:56:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727115AbgHDA43 (ORCPT ); Mon, 3 Aug 2020 20:56:29 -0400 Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDBB8C061756 for ; Mon, 3 Aug 2020 17:56:28 -0700 (PDT) Received: by mail-io1-xd2a.google.com with SMTP id k23so40451867iom.10 for ; Mon, 03 Aug 2020 17:56:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y/Am2cchrt0LWVMgs/INQC43mx+b9oZVcn7/zjmpPeA=; b=ukQOFBCeisIunp0pbhr6D3x/RKlcXV3c1Ac5mU2iGsgv6KXuZBkzSNXXw5vhHRvmkD mIPH7AfDAnhAHVmVBjHJfA/XqP8OpabvUYLjTCC3lyf1PfBMX9L/kpD29tOVBzDvLNzP mQOncTcLbpENQkwInjLp+Yvw4+ZM/u2fPve2q92cK/wx3xUNdNnxjQyF02W4x/5156Z/ OAM6C4GfPdtQPgUsoc8XGwgpT9SXvv5GgFouZ5Ou4ttT3nyOUKrKnAyjR1hZr3TMYxCJ j6bSy9htKptcgFD/8Hqt6RJ56dCYe/547icboSFYlIGjQrgNCOpq88jDkQ9ErgTuMHsj aBvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Y/Am2cchrt0LWVMgs/INQC43mx+b9oZVcn7/zjmpPeA=; b=EBstvhjYjv6+DEIUOnb48Mh7/9vaNMMumurCiC/o/3GB94CRRnGzJaqOhw+Zc74a5L wMep29nPdwHZKQoodPqFmW3GUb/Wy+/HxLPnH+sTIQMRd4dI0xlCRGSbARTFDDOnrOUV SZkqyfyo6GdlxDnYjcE5Rxo1VpXtBDy34UzHfs2483tK2UR+xIrm8rmL7o1t2E+F8614 Jm3C3c7Qt1gxPCnKjzfqh+eZ7MpErXGBFAhg8NvadPwjnv/rL8wkQY2sqJ7XV/vL/By8 RiIexcp6Yq/0VGCHz7NaP0RhXoEPeQHv0igDY2eSa21SjMiOlyEzHRRBL8o8TeuD17A5 CkaQ== X-Gm-Message-State: AOAM533AeETzM0YT2H/5Zzo4WmtRRQ87hXuhLaz5zp2PpKphoA0t0LYb Z85+vsIXZbJwzAEYAp7o1qG5QawV+Js= X-Google-Smtp-Source: ABdhPJw96jlX50cL93GMhwB6BoAjHltCU+N82K9MPBaqk0xNP37hTPRj2sxfQZitl/TpCcSDCDdSkQ== X-Received: by 2002:a05:6638:138a:: with SMTP id w10mr2765686jad.36.1596502586728; Mon, 03 Aug 2020 17:56:26 -0700 (PDT) Received: from localhost.localdomain (user-12l2dpj.cable.mindspring.com. [69.81.55.51]) by smtp.gmail.com with ESMTPSA id e84sm11878453ill.60.2020.08.03.17.56.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Aug 2020 17:56:26 -0700 (PDT) From: Eric Sunshine To: git@vger.kernel.org Cc: Duy Nguyen , Junio C Hamano , Taylor Blau , =?utf-8?q?Martin_=C3=85gren?= , Eric Sunshine Subject: [PATCH v2 1/5] git-worktree.txt: employ fixed-width typeface consistently Date: Mon, 3 Aug 2020 20:55:31 -0400 Message-Id: <20200804005535.5126-2-sunshine@sunshineco.com> X-Mailer: git-send-email 2.28.0.236.gb10cc79966 In-Reply-To: <20200804005535.5126-1-sunshine@sunshineco.com> References: <20200803053612.50095-1-sunshine@sunshineco.com> <20200804005535.5126-1-sunshine@sunshineco.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org git-worktree documentation generally does a good job of formatting literal text using a fixed-width typeface, however, some instances of unformatted literal text have crept in over time. Fix these. While at it, also fix a few incorrect typefaces resulting from wrong choice of Asciidoc quotes. Signed-off-by: Eric Sunshine --- Documentation/git-worktree.txt | 96 +++++++++++++++++----------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 4796c3c05e..f7c1bd34f8 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -25,8 +25,8 @@ Manage multiple working trees attached to the same repository. A git repository can support multiple working trees, allowing you to check out more than one branch at a time. With `git worktree add` a new working tree is associated with the repository. This new working tree is called a -"linked working tree" as opposed to the "main working tree" prepared by "git -init" or "git clone". A repository has one main working tree (if it's not a +"linked working tree" as opposed to the "main working tree" prepared by `git +init` or `git clone`. A repository has one main working tree (if it's not a bare repository) and zero or more linked working trees. When you are done with a linked working tree, remove it with `git worktree remove`. @@ -48,10 +48,10 @@ add []:: Create `` and checkout `` into it. The new working directory is linked to the current repository, sharing everything except working -directory specific files such as HEAD, index, etc. `-` may also be +directory specific files such as `HEAD`, `index`, etc. `-` may also be specified as ``; it is synonymous with `@{-1}`. + -If is a branch name (call it ``) and is not found, +If `` is a branch name (call it ``) and is not found, and neither `-b` nor `-B` nor `--detach` are used, but there does exist a tracking branch in exactly one remote (call it ``) with a matching name, treat as equivalent to: @@ -66,13 +66,13 @@ one for the purposes of disambiguation, even if the `` isn't unique across all remotes. Set it to e.g. `checkout.defaultRemote=origin` to always checkout remote branches from there if `` is ambiguous but exists on the -'origin' remote. See also `checkout.defaultRemote` in +`origin` remote. See also `checkout.defaultRemote` in linkgit:git-config[1]. + If `` is omitted and neither `-b` nor `-B` nor `--detach` used, then, as a convenience, the new worktree is associated with a branch (call it ``) named after `$(basename )`. If `` -doesn't exist, a new branch based on HEAD is automatically created as +doesn't exist, a new branch based on `HEAD` is automatically created as if `-b ` was given. If `` does exist, it will be checked out in the new worktree, if it's not checked out anywhere else, otherwise the command will refuse to create the worktree (unless @@ -83,7 +83,7 @@ list:: List details of each worktree. The main worktree is listed first, followed by each of the linked worktrees. The output details include if the worktree is bare, the revision currently checked out, and the branch currently checked out -(or 'detached HEAD' if none). +(or "detached HEAD" if none). lock:: @@ -100,7 +100,7 @@ or linked working trees containing submodules cannot be moved. prune:: -Prune working tree information in $GIT_DIR/worktrees. +Prune working tree information in `$GIT_DIR/worktrees`. remove:: @@ -128,7 +128,7 @@ OPTIONS `move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `` was deleted manually), then `--force` -allows the move to proceed; use --force twice if the destination is locked. +allows the move to proceed; use `--force` twice if the destination is locked. + `remove` refuses to remove an unclean working tree unless `--force` is used. To remove a locked working tree, specify `--force` twice. @@ -137,13 +137,13 @@ To remove a locked working tree, specify `--force` twice. -B :: With `add`, create a new branch named `` starting at ``, and check out `` into the new working tree. - If `` is omitted, it defaults to HEAD. + If `` is omitted, it defaults to `HEAD`. By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `` to ``. --detach:: - With `add`, detach HEAD in the new working tree. See "DETACHED HEAD" + With `add`, detach `HEAD` in the new working tree. See "DETACHED HEAD" in linkgit:git-checkout[1]. --[no-]checkout:: @@ -154,7 +154,7 @@ To remove a locked working tree, specify `--force` twice. --[no-]guess-remote:: With `worktree add `, without ``, instead - of creating a new branch from HEAD, if there exists a tracking + of creating a new branch from `HEAD`, if there exists a tracking branch in exactly one remote matching the basename of ``, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as "upstream" from the new branch. @@ -166,7 +166,7 @@ This can also be set up as the default behaviour by using the When creating a new branch, if `` is a branch, mark it as "upstream" from the new branch. This is the default if `` is a remote-tracking branch. See - "--track" in linkgit:git-branch[1] for details. + `--track` in linkgit:git-branch[1] for details. --lock:: Keep the working tree locked after creation. This is the @@ -185,14 +185,14 @@ This can also be set up as the default behaviour by using the -q:: --quiet:: - With 'add', suppress feedback messages. + With `add`, suppress feedback messages. -v:: --verbose:: With `prune`, report all removals. --expire