git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Eric Sunshine <sunshine@sunshineco.com>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
	"Git List" <git@vger.kernel.org>
Subject: Re: [PATCH 2/6] worktree: remove references to "git checkout --to" from the manpage
Date: Sat, 18 Jul 2015 22:56:03 -0400	[thread overview]
Message-ID: <CAPig+cSmRDNCY-k-1cVj7QzSJPP0NiKO+s2i2gLsacQBH8OxuA@mail.gmail.com> (raw)
In-Reply-To: <58c91f8907d5f3ef91607e85a96adcf0b1278e14.1437271363.git.mhagger@alum.mit.edu>

On Sat, Jul 18, 2015 at 10:10 PM, Michael Haggerty <mhagger@alum.mit.edu> wrote:
> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
> ---
> diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
> index c8dd0e5..707dfd0 100644
> --- a/Documentation/git-worktree.txt
> +++ b/Documentation/git-worktree.txt
> @@ -18,7 +18,7 @@ DESCRIPTION
>  Manage multiple worktrees 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 checkout --to` a new working
> +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
> @@ -99,7 +99,7 @@ Each linked working tree has a private sub-directory in the repository's
>  $GIT_DIR/worktrees directory.  The private sub-directory's name is usually
>  the base name of the linked working tree's path, possibly appended with a
>  number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the
> -command `git checkout --to /path/other/test-next next` creates the linked
> +command `git worktree add /path/other/test-next next` creates the linked
>  working tree in `/path/other/test-next` and also creates a
>  `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1`
>  if `test-next` is already taken).

These fixes are already in 'master': 4d5a3c5
(Documentation/git-worktree: fix stale "git checkout --to" references,
2015-07-16)

  reply	other threads:[~2015-07-19  2:56 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-19  2:10 [PATCH 0/6] Various tweaks to 'worktree'-related manpages Michael Haggerty
2015-07-19  2:10 ` [PATCH 1/6] worktree: consistently use term "linked working tree" in manpages Michael Haggerty
2015-07-19  2:54   ` Eric Sunshine
2015-07-19  2:10 ` [PATCH 2/6] worktree: remove references to "git checkout --to" from the manpage Michael Haggerty
2015-07-19  2:56   ` Eric Sunshine [this message]
2015-07-19  2:10 ` [PATCH 3/6] worktree: fix incorrect references to file "locked" Michael Haggerty
2015-07-19  3:04   ` Eric Sunshine
2015-07-19  2:10 ` [PATCH 4/6] worktree: the "locked" mechanism is already implemented Michael Haggerty
2015-07-19  3:06   ` Eric Sunshine
2015-07-19  2:10 ` [PATCH 5/6] config.txt: refer to "git worktree prune", not "prune --worktree" Michael Haggerty
2015-07-19  3:08   ` Eric Sunshine
2015-07-19  2:10 ` [PATCH 6/6] worktree: wordsmith worktree-related manpages Michael Haggerty
2015-07-19  3:21   ` Eric Sunshine
2015-07-19  2:50 ` [PATCH 0/6] Various tweaks to 'worktree'-related manpages Eric Sunshine

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAPig+cSmRDNCY-k-1cVj7QzSJPP0NiKO+s2i2gLsacQBH8OxuA@mail.gmail.com \
    --to=sunshine@sunshineco.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mhagger@alum.mit.edu \
    --cc=pclouds@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).