Autogenerated HTML docs for v1.4.4.1-g3fbe2

diff --git a/git-clone.html b/git-clone.html
index 427705a29f3409dbcd67dd06794f699150a000c4..c0c218d8adbec755af6af812e6fda4e2c0eb6341 100644 (file)
--- a/git-clone.html
+++ b/git-clone.html
@@ -275,7 +275,8 @@ git-clone(1) Manual Page
 <div class="verseblock">\r
 <div class="content"><em>git-clone</em> [--template=&lt;template_directory&gt;] [-l [-s]] [-q] [-n] [--bare]\r
           [-o &lt;name&gt;] [-u &lt;upload-pack&gt;] [--reference &lt;repository&gt;]\r
-          [--use-separate-remote] &lt;repository&gt; [&lt;directory&gt;]</div></div>\r
+          [--use-separate-remote | --use-immingled-remote] &lt;repository&gt;\r
+          [&lt;directory&gt;]</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -370,9 +371,13 @@ branch you are currently working on.  Remote branches other than
         Make a <em>bare</em> GIT repository.  That is, instead of\r
         creating <tt>&lt;directory&gt;</tt> and placing the administrative\r
         files in <tt>&lt;directory&gt;/.git</tt>, make the <tt>&lt;directory&gt;</tt>\r
-        itself the <tt>$GIT_DIR</tt>. This implies <tt>-n</tt> option.  When\r
-        this option is used, neither the <tt>origin</tt> branch nor the\r
-        default <tt>remotes/origin</tt> file is created.\r
+        itself the <tt>$GIT_DIR</tt>. This obviously implies the <tt>-n</tt>\r
+        because there is nowhere to check out the working tree.\r
+        Also the branch heads at the remote are copied directly\r
+        to corresponding local branch heads, without mapping\r
+        them to <tt>refs/remotes/origin/</tt>.  When this option is\r
+        used, neither the <tt>origin</tt> branch nor the default\r
+        <tt>remotes/origin</tt> file is created.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -420,8 +425,20 @@ branch you are currently working on.  Remote branches other than
 <dd>\r
 <p>\r
         Save remotes heads under <tt>$GIT_DIR/remotes/origin/</tt> instead\r
-        of <tt>$GIT_DIR/refs/heads/</tt>.  Only the master branch is saved\r
-        in the latter.\r
+        of <tt>$GIT_DIR/refs/heads/</tt>.  Only the local master branch is\r
+        saved in the latter. This is the default.\r
+</p>\r
+</dd>\r
+<dt>\r
+--use-immingled-remote\r
+</dt>\r
+<dd>\r
+<p>\r
+        Save remotes heads in the same namespace as the local\r
+        heads, `$GIT_DIR/refs/heads/'.  In regular repositories,\r
+        this is a legacy setup git-clone created by default in\r
+        older Git versions, and will be removed before the next\r
+        major release.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -519,7 +536,7 @@ Create a repository on the kernel.org machine that borrows from Linus
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Nov-2006 02:39:57 UTC\r
+Last updated 24-Nov-2006 11:37:02 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-clone.txt b/git-clone.txt
index 86060472ad88088bcb59df5eb9acce097f68cb83..4cb42237b559723a0e59ac8e29c78a20304f38d0 100644 (file)
--- a/git-clone.txt
+++ b/git-clone.txt
@@ -11,7 +11,8 @@ SYNOPSIS
 [verse]
 'git-clone' [--template=<template_directory>] [-l [-s]] [-q] [-n] [--bare]
          [-o <name>] [-u <upload-pack>] [--reference <repository>]
-         [--use-separate-remote] <repository> [<directory>]
+         [--use-separate-remote | --use-immingled-remote] <repository>
+         [<directory>]
 
 DESCRIPTION
 -----------
@@ -71,9 +72,13 @@ OPTIONS
        Make a 'bare' GIT repository.  That is, instead of
        creating `<directory>` and placing the administrative
        files in `<directory>/.git`, make the `<directory>`
-       itself the `$GIT_DIR`. This implies `-n` option.  When
-       this option is used, neither the `origin` branch nor the
-       default `remotes/origin` file is created.
+       itself the `$GIT_DIR`. This obviously implies the `-n`
+       because there is nowhere to check out the working tree.
+       Also the branch heads at the remote are copied directly
+       to corresponding local branch heads, without mapping
+       them to `refs/remotes/origin/`.  When this option is
+       used, neither the `origin` branch nor the default
+       `remotes/origin` file is created.
 
 --origin <name>::
 -o <name>::
@@ -97,8 +102,15 @@ OPTIONS
 
 --use-separate-remote::
        Save remotes heads under `$GIT_DIR/remotes/origin/` instead
-       of `$GIT_DIR/refs/heads/`.  Only the master branch is saved
-       in the latter.
+       of `$GIT_DIR/refs/heads/`.  Only the local master branch is
+       saved in the latter. This is the default.
+
+--use-immingled-remote::
+       Save remotes heads in the same namespace as the local
+       heads, `$GIT_DIR/refs/heads/'.  In regular repositories,
+       this is a legacy setup git-clone created by default in
+       older Git versions, and will be removed before the next
+       major release.
 
 <repository>::
        The (possibly remote) repository to clone from.  It can