undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetch doc: move FETCH_HEAD material lower and add an example

Browse Source 
Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Marc Branchaud 2014-06-02 11:21:47 -04:00 committed by Junio C Hamano
parent 532845604d
commit 366a0184e5
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Documentation/git-fetch.txt
View File

@ -18,13 +18,9 @@ SYNOPSIS
DESCRIPTION DESCRIPTION
----------- -----------
Fetch branches and/or tags (collectively, "refs") from one or more Fetch branches and/or tags (collectively, "refs") from one or more
other repositories, along with the objects necessary to complete other repositories, along with the objects necessary to complete their
their histories. histories. Remote-tracking branches are updated (see the description
of <refspec> below for ways to control this behavior).
The names of refs that are fetched, together with the object names
they point at, are written to `.git/FETCH_HEAD`. This information
can be used to learn what was fetched. In addition, the remote-tracking
branches are updated (see description on <refspec> below for details).
By default, any tag that points into the histories being fetched is By default, any tag that points into the histories being fetched is
also fetched; the effect is to fetch tags that also fetched; the effect is to fetch tags that
@ -34,7 +30,7 @@ configuring remote.<name>.tagopt. By using a refspec that fetches tags
explicitly, you can fetch tags that do not point into branches you explicitly, you can fetch tags that do not point into branches you
are interested in as well. are interested in as well.
'git fetch' can fetch from either a single named repository, 'git fetch' can fetch from either a single named repository or URL,
or from several repositories at once if <group> is given and or from several repositories at once if <group> is given and
there is a remotes.<group> entry in the configuration file. there is a remotes.<group> entry in the configuration file.
(See linkgit:git-config[1]). (See linkgit:git-config[1]).
@ -42,6 +38,10 @@ there is a remotes.<group> entry in the configuration file.
When no remote is specified, by default the `origin` remote will be used, When no remote is specified, by default the `origin` remote will be used,
unless there's an upstream branch configured for the current branch. unless there's an upstream branch configured for the current branch.
The names of refs that are fetched, together with the object names
they point at, are written to `.git/FETCH_HEAD`. This information
may be used by scripts or other git commands, such as linkgit:git-pull[1].
OPTIONS OPTIONS
------- -------
include::fetch-options.txt[] include::fetch-options.txt[]
@ -78,6 +78,19 @@ the local repository by fetching from the branches (respectively)
The `pu` branch will be updated even if it is does not fast-forward, The `pu` branch will be updated even if it is does not fast-forward,
because it is prefixed with a plus sign; `tmp` will not be. because it is prefixed with a plus sign; `tmp` will not be.
* Peek at a remote's branch, without configuring the remote in your local
repository:
+
------------------------------------------------
$ git fetch git://git.kernel.org/pub/scm/git/git.git maint
$ git log FETCH_HEAD
------------------------------------------------
+
The first command fetches the `maint` branch from the repository at
`git://git.kernel.org/pub/scm/git/git.git` and the second command uses
`FETCH_HEAD` to examine the branch with linkgit:git-log[1]. The fetched
objects will eventually be removed by git's built-in housekeeping (see
linkgit:git-gc[1]).
BUGS BUGS
---- ----