From e663a7acb10392380c82054b20e6011650051425 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 25 Jan 2006 04:37:28 -0800 Subject: [PATCH] Autogenerated HTML docs for v1.1.4-g9264 --- fetch-options.txt | 7 +++++++ git-clone.html | 18 ++++++++++-------- git-clone.txt | 16 +++++++++------- git-fetch.html | 16 +++++++++++++++- git-pull.html | 16 +++++++++++++++- git.html | 2 +- git.txt | 2 +- repository-layout.html | 8 ++++---- repository-layout.txt | 6 +++--- 9 files changed, 65 insertions(+), 26 deletions(-) diff --git a/fetch-options.txt b/fetch-options.txt index e624d3d0..83237562 100644 --- a/fetch-options.txt +++ b/fetch-options.txt @@ -3,6 +3,13 @@ existing contents of `.git/FETCH_HEAD`. Without this option old data in `.git/FETCH_HEAD` will be overwritten. +--upload-pack :: +-u :: + When given, and the repository to fetch from is handled + by 'git-fetch-pack', '--exec=' is passed to + the command to specify non-default path for the command + run on the other end. + -f, \--force:: When `git-fetch` is used with `:` refspec, it refuses to update the local branch diff --git a/git-clone.html b/git-clone.html index eade541c..6ade3cbc 100644 --- a/git-clone.html +++ b/git-clone.html @@ -273,7 +273,7 @@ git-clone(1) Manual Page

SYNOPSIS

-
git-clone [-l [-s]] [-q] [-n] [--naked] [-o <name>] [-u <upload-pack>] +
git-clone [-l [-s]] [-q] [-n] [--bare] [-o <name>] [-u <upload-pack>] <repository> [<directory>]

DESCRIPTION

@@ -349,14 +349,16 @@ branch you are currently working on. Remote branches other than

---naked +--bare

- Make a naked GIT repository. That is, instead of + 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. + 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.

@@ -432,12 +434,12 @@ $ git show-branch
-Create a naked repository to publish your changes to the public +Create a bare repository to publish your changes to the public
-
$ git clone --naked -l /home/proj/.git /pub/scm/proj.git
+
$ git clone --bare -l /home/proj/.git /pub/scm/proj.git
@@ -446,7 +448,7 @@ Create a repository on the kernel.org machine that borrows from Linus
-
$ git clone --naked -l -s /pub/scm/.../torvalds/linux-2.6.git \
+
$ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \
     /pub/scm/.../me/subsys-2.6.git
@@ -466,7 +468,7 @@ Create a repository on the kernel.org machine that borrows from Linus diff --git a/git-clone.txt b/git-clone.txt index 8488202e..684e4bdf 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -9,7 +9,7 @@ git-clone - Clones a repository. SYNOPSIS -------- [verse] -'git-clone' [-l [-s]] [-q] [-n] [--naked] [-o ] [-u ] +'git-clone' [-l [-s]] [-q] [-n] [--bare] [-o ] [-u ] [] DESCRIPTION @@ -58,11 +58,13 @@ OPTIONS -n:: No checkout of HEAD is performed after the clone is complete. ---naked:: - Make a 'naked' GIT repository. That is, instead of +--bare:: + 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. + 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. -o :: Instead of using the branch name 'origin' to keep track @@ -110,17 +112,17 @@ $ git show-branch ------------ -Create a naked repository to publish your changes to the public:: +Create a bare repository to publish your changes to the public:: + ------------ -$ git clone --naked -l /home/proj/.git /pub/scm/proj.git +$ git clone --bare -l /home/proj/.git /pub/scm/proj.git ------------ Create a repository on the kernel.org machine that borrows from Linus:: + ------------ -$ git clone --naked -l -s /pub/scm/.../torvalds/linux-2.6.git \ +$ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \ /pub/scm/.../me/subsys-2.6.git ------------ diff --git a/git-fetch.html b/git-fetch.html index da606d45..8a11e780 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -296,6 +296,20 @@ operation done by "git merge".

+--upload-pack <upload-pack> +
+
+-u <upload-pack> +
+
+

+ When given, and the repository to fetch from is handled + by git-fetch-pack, --exec=<upload-pack> is passed to + the command to specify non-default path for the command + run on the other end. +

+
+
-f, --force
@@ -599,7 +613,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-pull.html b/git-pull.html index 3e384cad..d4dcc302 100644 --- a/git-pull.html +++ b/git-pull.html @@ -326,6 +326,20 @@ when merging local branches into the current branch.

+--upload-pack <upload-pack> +
+
+-u <upload-pack> +
+
+

+ When given, and the repository to fetch from is handled + by git-fetch-pack, --exec=<upload-pack> is passed to + the command to specify non-default path for the command + run on the other end. +

+
+
-f, --force
@@ -787,7 +801,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

diff --git a/git.html b/git.html index b879259d..32f40a4f 100644 --- a/git.html +++ b/git.html @@ -2023,7 +2023,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index 25bcb840..e8ef3efa 100644 --- a/git.txt +++ b/git.txt @@ -586,7 +586,7 @@ git Diffs Discussion[[Discussion]] ------------------------ -include::../README[] +include::README[] Authors ------- diff --git a/repository-layout.html b/repository-layout.html index a49b8318..3ef3215c 100644 --- a/repository-layout.html +++ b/repository-layout.html @@ -265,7 +265,7 @@ div.exampleblock-content {

You may find these things in your git repository (.git directory for a repository associated with your working tree, or -project.git directory for a public naked repository).

+project.git directory for a public bare repository).

objects @@ -393,7 +393,7 @@ HEAD A symlink of the form refs/heads/name to point at the current branch, if exists. It does not mean much if the repository is not associated with any working tree - (i.e. naked repository), but a valid git repository + (i.e. a bare repository), but a valid git repository must have such a symlink here. It is legal if the named branch name does not (yet) exist.

@@ -427,7 +427,7 @@ index

The current index file for the repository. It is - usually not found in a naked repository. + usually not found in a bare repository.

@@ -493,7 +493,7 @@ remotes
diff --git a/repository-layout.txt b/repository-layout.txt index 0347cabb..1f19bf86 100644 --- a/repository-layout.txt +++ b/repository-layout.txt @@ -3,7 +3,7 @@ git repository layout You may find these things in your git repository (`.git` directory for a repository associated with your working tree, or -`'project'.git` directory for a public 'naked' repository). +`'project'.git` directory for a public 'bare' repository). objects:: Object store associated with this repository. Usually @@ -73,7 +73,7 @@ HEAD:: A symlink of the form `refs/heads/'name'` to point at the current branch, if exists. It does not mean much if the repository is not associated with any working tree - (i.e. 'naked' repository), but a valid git repository + (i.e. a 'bare' repository), but a valid git repository *must* have such a symlink here. It is legal if the named branch 'name' does not (yet) exist. @@ -92,7 +92,7 @@ hooks:: index:: The current index file for the repository. It is - usually not found in a naked repository. + usually not found in a bare repository. info:: Additional information about the repository is recorded -- 2.11.0