Autogenerated HTML docs for v1.6.0-106-gd6096

1 files changed, 11 insertions, 4 deletions

diff --git a/git-checkout.html b/git-checkout.html
index afa2b48a9..68dcbc191 100644
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -395,9 +395,16 @@ working tree.</p></div>
         given. Set it to <tt>always</tt> if you want this behavior when the

         start-point is either a local or remote branch.

 </p>

-<div class="para"><p>If no <em>-b</em> option was given, a name will be made up for you, by stripping

-the part up to the first slash of the tracked branch.  For example, if you

-called <em>git checkout --track origin/next</em>, the branch name will be <em>next</em>.</p></div>

+<div class="para"><p>If no <em>-b</em> option was given, the name of the new branch will be

+derived from the remote branch, by attempting to guess the name

+of the branch on remote system.  If "remotes/" or "refs/remotes/"

+are prefixed, it is stripped away, and then the part up to the

+next slash (which would be the nickname of the remote) is removed.

+This would tell us to use "hack" as the local branch when branching

+off of "origin/hack" (or "remotes/origin/hack", or even

+"refs/remotes/origin/hack").  If the given name has no slash, or the above

+guessing results in an empty name, the guessing is aborted.  You can

+exlicitly give a name with <em>-b</em> in such a case.</p></div>

 </dd>

 <dt>

 --no-track

@@ -596,7 +603,7 @@ $ git add frotz</tt></pre>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2008-08-20 09:13:27 UTC

+Last updated 2008-08-24 03:33:55 UTC

 </div>

 </div>

 </body>