diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/fetch-options.txt | 7 | ||||
| -rw-r--r-- | Documentation/git-clone.txt | 16 | ||||
| -rw-r--r-- | Documentation/repository-layout.txt | 6 |
3 files changed, 19 insertions, 10 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index e624d3d0e..83237562d 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/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 <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:: When `git-fetch` is used with `<rbranch>:<lbranch>` refspec, it refuses to update the local branch diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index 8488202e3..684e4bdf6 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -9,7 +9,7 @@ git-clone - Clones a repository. SYNOPSIS -------- [verse] -'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 @@ -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 `<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. -o <name>:: 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/Documentation/repository-layout.txt b/Documentation/repository-layout.txt index 0347cabbb..1f19bf86d 100644 --- a/Documentation/repository-layout.txt +++ b/Documentation/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 |