Autogenerated HTML docs for v2.5.0-330-g130be

1 files changed, 25 insertions, 25 deletions

diff --git a/git-worktree.html b/git-worktree.html
index 6e592d0a1..5ae5f6c33 100644
--- a/git-worktree.html
+++ b/git-worktree.html
@@ -739,7 +739,7 @@ git-worktree(1) Manual Page
 <h2>NAME</h2>

 <div class="sectionbody">

 <p>git-worktree -

-   Manage multiple worktrees

+   Manage multiple working trees

 </p>

 </div>

 </div>

@@ -757,7 +757,7 @@ git-worktree(1) Manual Page
 <div class="sect1">

 <h2 id="_description">DESCRIPTION</h2>

 <div class="sectionbody">

-<div class="paragraph"><p>Manage multiple worktrees attached to the same repository.</p></div>

+<div class="paragraph"><p>Manage multiple working trees attached to the same repository.</p></div>

 <div class="paragraph"><p>A git repository can support multiple working trees, allowing you to check

 out more than one branch at a time.  With <code>git worktree add</code> a new working

 tree is associated with the repository.  This new working tree is called a

@@ -767,17 +767,17 @@ bare repository) and zero or more linked working trees.</p></div>
 <div class="paragraph"><p>When you are done with a linked working tree you can simply delete it.

 The working tree&#8217;s administrative files in the repository (see

 "DETAILS" below) will eventually be removed automatically (see

-<code>gc.pruneworktreesexpire</code> in <a href=":git-config.html">:git-config(1)</a>), or you can run

+<code>gc.worktreePruneExpire</code> in <a href="git-config.html">git-config(1)</a>), or you can run

 <code>git worktree prune</code> in the main or any linked working tree to

 clean up any stale administrative files.</p></div>

-<div class="paragraph"><p>If you move a linked working directory to another file system, or

+<div class="paragraph"><p>If you move a linked working tree to another file system, or

 within a file system that does not support hard links, you need to run

-at least one git command inside the linked working directory

+at least one git command inside the linked working tree

 (e.g. <code>git status</code>) in order to update its administrative files in the

 repository so that they do not get automatically pruned.</p></div>

 <div class="paragraph"><p>If a linked working tree is stored on a portable device or network share

 which is not always mounted, you can prevent its administrative files from

-being pruned by creating a file named <em>lock</em> alongside the other

+being pruned by creating a file named <em>locked</em> alongside the other

 administrative files, optionally containing a plain text reason that

 pruning should be suppressed. See section "DETAILS" for more information.</p></div>

 </div>

@@ -795,9 +795,9 @@ Create <code>&lt;path&gt;</code> and checkout <code>&lt;branch&gt;</code> into i
 is linked to the current repository, sharing everything except working

 directory specific files such as HEAD, index, etc.

 </p>

-<div class="paragraph"><p>If <code>&lt;branch&gt;</code> is omitted and neither <code>-b</code> nor <code>-B</code> is used, then, as a

-convenience, a new branch based at HEAD is created automatically, as if

-<code>-b $(basename &lt;path&gt;)</code> was specified.</p></div>

+<div class="paragraph"><p>If <code>&lt;branch&gt;</code> is omitted and neither <code>-b</code> nor <code>-B</code> nor <code>--detached</code> used,

+then, as a convenience, a new branch based at HEAD is created automatically,

+as if <code>-b $(basename &lt;path&gt;)</code> was specified.</p></div>

 </dd>

 <dt class="hdlist1">

 prune

@@ -822,8 +822,8 @@ Prune working tree information in $GIT_DIR/worktrees.
 </dt>

 <dd>

 <p>

-        By default, <code>add</code> refuses to create a new worktree when <code>&lt;branch&gt;</code>

-        is already checked out by another worktree. This option overrides

+        By default, <code>add</code> refuses to create a new working tree when <code>&lt;branch&gt;</code>

+        is already checked out by another working tree. This option overrides

         that safeguard.

 </p>

 </dd>

@@ -836,7 +836,7 @@ Prune working tree information in $GIT_DIR/worktrees.
 <dd>

 <p>

         With <code>add</code>, create a new branch named <code>&lt;new-branch&gt;</code> starting at

-        <code>&lt;branch&gt;</code>, and check out <code>&lt;new-branch&gt;</code> into the new worktree.

+        <code>&lt;branch&gt;</code>, and check out <code>&lt;new-branch&gt;</code> into the new working tree.

         If <code>&lt;branch&gt;</code> is omitted, it defaults to HEAD.

         By default, <code>-b</code> refuses to create a new branch if it already

         exists. <code>-B</code> overrides this safeguard, resetting <code>&lt;new-branch&gt;</code> to

@@ -848,8 +848,8 @@ Prune working tree information in $GIT_DIR/worktrees.
 </dt>

 <dd>

 <p>

-        With <code>add</code>, detach HEAD in the new worktree. See "DETACHED HEAD" in

-        <a href="git-checkout.html">git-checkout(1)</a>.

+        With <code>add</code>, detach HEAD in the new working tree. See "DETACHED HEAD"

+        in <a href="git-checkout.html">git-checkout(1)</a>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -880,7 +880,7 @@ Prune working tree information in $GIT_DIR/worktrees.
 </dt>

 <dd>

 <p>

-        With <code>prune</code>, only expire unused worktrees older than &lt;time&gt;.

+        With <code>prune</code>, only expire unused working trees older than &lt;time&gt;.

 </p>

 </dd>

 </dl></div>

@@ -914,7 +914,7 @@ since refs are shared across all working trees.</p></div>
 thumb is do not make any assumption about whether a path belongs to

 $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something

 inside $GIT_DIR. Use <code>git rev-parse --git-path</code> to get the final path.</p></div>

-<div class="paragraph"><p>To prevent a $GIT_DIR/worktrees entry from from being pruned (which

+<div class="paragraph"><p>To prevent a $GIT_DIR/worktrees entry from being pruned (which

 can be useful in some situations, such as when the

 entry&#8217;s working tree is stored on a portable device), add a file named

 <em>locked</em> to the entry&#8217;s directory. The file contains the reason in

@@ -931,9 +931,9 @@ to <code>/path/main/.git/worktrees/test-next</code> then a file named
 <div class="paragraph"><p>You are in the middle of a refactoring session and your boss comes in and

 demands that you fix something immediately. You might typically use

 <a href="git-stash.html">git-stash(1)</a> to store your changes away temporarily, however, your

-worktree is in such a state of disarray (with new, moved, and removed files,

-and other bits and pieces strewn around) that you don&#8217;t want to risk

-disturbing any of it. Instead, you create a temporary linked worktree to

+working tree is in such a state of disarray (with new, moved, and removed

+files, and other bits and pieces strewn around) that you don&#8217;t want to risk

+disturbing any of it. Instead, you create a temporary linked working tree to

 make the emergency fix, remove it when done, and then resume your earlier

 refactoring session.</p></div>

 <div class="listingblock">

@@ -959,24 +959,24 @@ performed manually, such as:</p></div>
 <div class="ulist"><ul>

 <li>

 <p>

-<code>remove</code> to remove a linked worktree and its administrative files (and

-  warn if the worktree is dirty)

+<code>remove</code> to remove a linked working tree and its administrative files (and

+  warn if the working tree is dirty)

 </p>

 </li>

 <li>

 <p>

-<code>mv</code> to move or rename a worktree and update its administrative files

+<code>mv</code> to move or rename a working tree and update its administrative files

 </p>

 </li>

 <li>

 <p>

-<code>list</code> to list linked worktrees

+<code>list</code> to list linked working trees

 </p>

 </li>

 <li>

 <p>

 <code>lock</code> to prevent automatic pruning of administrative files (for instance,

-  for a worktree on a portable device)

+  for a working tree on a portable device)

 </p>

 </li>

 </ul></div>

@@ -992,7 +992,7 @@ performed manually, such as:</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2015-07-17 15:44:24 PDT

+Last updated 2015-08-12 14:58:45 PDT

 </div>

 </div>

 </body>