diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-24 16:23:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-24 16:50:54 -0700 |
| commit | ab9b31386b494b6c16d651d1560f3ba11c3a1964 (patch) | |
| tree | b236326ca11e2180a58dd15cbde457871bb56244 /Documentation/git-pull-script.txt | |
| parent | ff27adf3dae36695f1af1b6f0e01ec6738ce0249 (diff) | |
| download | git-ab9b31386b494b6c16d651d1560f3ba11c3a1964.tar.xz | |
Documentation: multi-head fetch.
Add documentation related to multi-head work, including $GIT_DIR/remotes/
changes.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-pull-script.txt')
| -rw-r--r-- | Documentation/git-pull-script.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/git-pull-script.txt b/Documentation/git-pull-script.txt index ad9d3ab315..8111813b85 100644 --- a/Documentation/git-pull-script.txt +++ b/Documentation/git-pull-script.txt @@ -9,13 +9,16 @@ git-pull-script - Pull and merge from another repository. SYNOPSIS -------- -'git-pull-script' <repository> [ <head> | tag <tag> ] +'git-pull-script' <repository> <refspec>... DESCRIPTION ----------- -Runs 'git-fetch-script' with the given parameters, then -'git-resolve-script' to merge the local HEAD and FETCH_HEAD. +Runs 'git-fetch-script' with the given parameters. + +When only one ref is downloaded, runs 'git resolve' to merge it +into the local HEAD. Otherwise uses 'git octopus' to merge them +into the local HEAD. OPTIONS |