From 4d5a3c588480953bd94dcc68ff198ad78e562c46 Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Thu, 16 Jul 2015 18:09:43 -0400 Subject: Documentation/git-worktree: fix stale "git checkout --to" references These should have been changed to "git worktree add" by fc56361 (worktree: introduce "add" command, 2015-07-06. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- Documentation/git-worktree.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation') diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index da71f508b1..44619f2c0e 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). -- cgit v1.2.1 From 18b22dbed8e106cfc7899d1c606c1f7c12de6404 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 16 Jul 2015 15:59:48 -0700 Subject: worktree: caution that this is still experimental Signed-off-by: Junio C Hamano --- Documentation/git-worktree.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Documentation') diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 44619f2c0e..3387e2f037 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -157,8 +157,9 @@ $ git worktree prune BUGS ---- -Multiple checkout support for submodules is incomplete. It is NOT -recommended to make multiple checkouts of a superproject. +Multiple checkout in general is still experimental, and the support +for submodules is incomplete. It is NOT recommended to make multiple +checkouts of a superproject. git-worktree could provide more automation for tasks currently performed manually, such as: -- cgit v1.2.1 From 1eaca7a5bbd2d1c418da3b3472e10a5baa06c746 Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Thu, 16 Jul 2015 20:17:02 -0400 Subject: Documentation/git: fix stale "MULTIPLE CHECKOUT MODE" reference This should have been changed by 93a3649 (Documentation: move linked worktree description from checkout to worktree, 2015-07-06). Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- Documentation/git.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/git.txt b/Documentation/git.txt index 0c2dcfa9cc..ef76f95270 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -814,7 +814,7 @@ Git so take care if using Cogito etc. normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and - the section 'MULTIPLE CHECKOUT MODE' in linkgit:checkout[1] + linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY... -- cgit v1.2.1