mirror of
https://github.com/git/git.git
synced 2024-09-20 21:03:29 +02:00
710c97dbb1
The repository to pull from can be a local repository, and as a special case the current directory can be specified to perform merges across local branches. Signed-off-by: Junio C Hamano <junkio@cox.net>
48 lines
1.0 KiB
Plaintext
48 lines
1.0 KiB
Plaintext
git-pull(1)
|
|
===========
|
|
|
|
NAME
|
|
----
|
|
git-pull - Pull and merge from another repository.
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git-pull' <repository> <refspec>...
|
|
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
Runs 'git-fetch' 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.
|
|
|
|
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.
|
|
|
|
OPTIONS
|
|
-------
|
|
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.
|
|
|
|
Author
|
|
------
|
|
Written by Linus Torvalds <torvalds@osdl.org>
|
|
and Junio C Hamano <junkio@cox.net>
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
GIT
|
|
---
|
|
Part of the gitlink:git[7] suite
|
|
|