From: Junio C Hamano Date: Fri, 24 Nov 2006 11:37:29 +0000 (+0000) Subject: Autogenerated HTML docs for v1.4.4.1-g3fbe2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9f292e7bac14ec22b2dd8285e7f4ae7d21078e2b;p=git.git Autogenerated HTML docs for v1.4.4.1-g3fbe2 --- diff --git a/git-clone.html b/git-clone.html index 427705a29..c0c218d8a 100644 --- a/git-clone.html +++ b/git-clone.html @@ -275,7 +275,8 @@ git-clone(1) Manual Page
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

@@ -370,9 +371,13 @@ branch you are currently working on. Remote branches other than 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.

@@ -420,8 +425,20 @@ branch you are currently working on. Remote branches other than

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.

@@ -519,7 +536,7 @@ Create a repository on the kernel.org machine that borrows from Linus
diff --git a/git-clone.txt b/git-clone.txt index 86060472a..4cb42237b 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -11,7 +11,8 @@ SYNOPSIS [verse] 'git-clone' [--template=] [-l [-s]] [-q] [-n] [--bare] [-o ] [-u ] [--reference ] - [--use-separate-remote] [] + [--use-separate-remote | --use-immingled-remote] + [] DESCRIPTION ----------- @@ -71,9 +72,13 @@ OPTIONS Make a 'bare' GIT repository. That is, instead of creating `` and placing the administrative files in `/.git`, make the `` - 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 :: -o :: @@ -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. :: The (possibly remote) repository to clone from. It can