diff options
author | Junio C Hamano <junkio@cox.net> | 2005-08-12 02:08:29 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-08-12 10:38:21 -0700 |
commit | 33b8303466af9a839265abc9829e5479f6f12488 (patch) | |
tree | a4cbae5b7ae5f895b8dad09187e57217b4127cf5 /Documentation/git-fetch-pack.txt | |
parent | 87b7b84159381f5f0483e425122886cd952e374e (diff) | |
download | git-33b8303466af9a839265abc9829e5479f6f12488.tar.gz git-33b8303466af9a839265abc9829e5479f6f12488.tar.xz |
fetch-pack: start multi-head pulling.
This is a beginning of resurrecting the multi-head pulling support
for git-fetch-pack command. The git-fetch-script wrapper still
only knows about fetching a single head, without renaming, so it is
not very useful unless you directly call git-fetch-pack itself yet.
It also fixes a longstanding obsolete description of how the command
discovers the list of local commits.
Diffstat (limited to 'Documentation/git-fetch-pack.txt')
-rw-r--r-- | Documentation/git-fetch-pack.txt | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/Documentation/git-fetch-pack.txt b/Documentation/git-fetch-pack.txt index 884a26bbf..59afa14a3 100644 --- a/Documentation/git-fetch-pack.txt +++ b/Documentation/git-fetch-pack.txt @@ -9,19 +9,19 @@ git-fetch-pack - Receive missing objects from another repository. SYNOPSIS -------- -git-fetch-pack [-q] [--exec=<git-upload-pack>] [<host>:]<directory> [<head>...] < <commit-list> +git-fetch-pack [-q] [--exec=<git-upload-pack>] [<host>:]<directory> [<refs>...] DESCRIPTION ----------- Invokes 'git-upload-pack' on a potentially remote repository, and asks it to send objects missing from this repository, to update the named heads. The list of commits available locally -is fed from the standard input, to be sent to 'git-upload-pack' -running on the other end. +is found out by scanning local $GIT_DIR/refs/ and sent to +'git-upload-pack' running on the other end. -This command can be used only when the local side has a common -(ancestor) commit with the remote head that is being pulled -from. Use 'git-clone-pack' for that. +This command degenerates to download everything to complete the +asked refs from the remote side when the local side does not +have a common ancestor commit. OPTIONS @@ -50,15 +50,11 @@ OPTIONS <directory>:: The repository to sync from. -<head>...:: +<refs>...:: The remote heads to update from. This is relative to $GIT_DIR (e.g. "HEAD", "refs/heads/master"). When unspecified, update from all heads the remote side has. - However the program refuses to work if more than one - remote head matches the specified heads. I am not sure - what this means... Help!!!!! - Author ------ |