path: root/Documentation/git-pull.txt
diff options
authorJon Loeliger <>2005-11-05 02:36:08 (GMT)
committerJunio C Hamano <>2005-11-05 03:28:39 (GMT)
commitbccf5956c323a043e9a5d540b3c842ae6e5e5220 (patch)
treeef3876e50bb5e91a6fb40d4e59df2178c6f40237 /Documentation/git-pull.txt
parentd8ae1d10cd08ff1f0b749222d083446ef7bd8f3f (diff)
Added a few examples to git-pull man page.
Clarified and added notes for pull/push refspecs. Converted to back-ticks for literal text examples. [jc: Also fixed git-pull description that still talked about its calling git-resolve or git-octopus (we do not anymore; instead we just call git-merge). BTW, I am reasonably impressed by how well "git-am -3" applied this patch, which had some conflicts because I've updated the documentation somewhat.] Signed-off-by: Jon Loeliger <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/git-pull.txt')
1 files changed, 54 insertions, 9 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 2f8a9ce..5a11da1 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -13,13 +13,10 @@ SYNOPSIS
-Runs 'git-fetch' with the given parameters.
+Runs `git-fetch` with the given parameters, and calls `git-merge`
+to merge the retrieved head(s) into the current branch.
-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.
-Note that you can use '.' (current directory) as the
+Note that you can use `.` (current directory) as the
<repository> to pull from the local repository -- this is useful
when merging local branches into the current branch.
@@ -29,8 +26,8 @@ include::pull-fetch-param.txt[]
-a, \--append::
Append ref names and object names of fetched refs to the
- existing contents of $GIT_DIR/FETCH_HEAD. Without this
- option old data in $GIT_DIR/FETCH_HEAD will be overwritten.
+ existing contents of `$GIT_DIR/FETCH_HEAD`. Without this
+ option old data in `$GIT_DIR/FETCH_HEAD` will be overwritten.
@@ -97,6 +94,52 @@ You should refrain from abusing this option to sneak substantial
changes into a merge commit. Small fixups like bumping
release/version name would be acceptable.
+Command line pull of multiple branches from one repository::
+$ cat .git/remotes/origin
+URL: git://
+Pull: master:origin
+$ git checkout master
+$ git fetch origin master:origin +pu:pu maint:maint
+$ git pull . origin
+Here, a typical `$GIT_DIR/remotes/origin` file from a
+`git-clone` operation is used in combination with
+command line options to `git-fetch` to first update
+multiple branches of the local repository and then
+to merge the remote `origin` branch into the local
+`master` branch. The local `pu` branch is updated
+even if it does not result in a fast forward update.
+Here, the pull can obtain its objects from the local
+repository using `.`, as the previous `git-fetch` is
+known to have already obtained and made available
+all the necessary objects.
+Pull of multiple branches from one repository using `$GIT_DIR/remotes` file::
+$ cat .git/remotes/origin
+URL: git://
+Pull: master:origin
+Pull: +pu:pu
+Pull: maint:maint
+$ git checkout master
+$ git pull origin
+Here, a typical `$GIT_DIR/remotes/origin` file from a
+`git-clone` operation has been hand-modified to include
+the branch-mapping of additional remote and local
+heads directly. A single `git-pull` operation while
+in the `master` branch will fetch multiple heads and
+merge the remote `origin` head into the current,
+local `master` branch.
@@ -105,7 +148,9 @@ and Junio C Hamano <>
-Documentation by David Greaves, Junio C Hamano and the git-list <>.
+Documentation by Jon Loeliger,
+David Greaves,
+Junio C Hamano and the git-list <>.