summaryrefslogtreecommitdiff
path: root/Documentation/git-pull-script.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-24 23:23:08 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-24 23:50:54 (GMT)
commitab9b31386b494b6c16d651d1560f3ba11c3a1964 (patch)
treeb236326ca11e2180a58dd15cbde457871bb56244 /Documentation/git-pull-script.txt
parentff27adf3dae36695f1af1b6f0e01ec6738ce0249 (diff)
downloadgit-ab9b31386b494b6c16d651d1560f3ba11c3a1964.zip
git-ab9b31386b494b6c16d651d1560f3ba11c3a1964.tar.gz
git-ab9b31386b494b6c16d651d1560f3ba11c3a1964.tar.bz2
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.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/git-pull-script.txt b/Documentation/git-pull-script.txt
index ad9d3ab..8111813 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