d6a73596e7
The documentation was lazily sharing the argument description across these commands. Lazy may be a way of life, but that does not justify confusing others ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
45 lines
864 B
Plaintext
45 lines
864 B
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.
|
|
|
|
|
|
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
|
|
|