summaryrefslogtreecommitdiff
path: root/Documentation/pull-fetch-param.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-23 00:03:15 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-23 00:03:15 -0800
commit65c042d44dc843021f1410f1219104681fdd3469 (patch)
treeead97f95ff999e3279929760d095c0edcb1adf1a /Documentation/pull-fetch-param.txt
parentfc13aa3d09407998e5cb08a5c1da05d0000fe81d (diff)
parent8db355964d89c19eb262ffe38e57e5a610e1cc05 (diff)
downloadgit-65c042d44dc843021f1410f1219104681fdd3469.tar.gz
Merge branch 'bg/fetch-multi'
* bg/fetch-multi: Re-implement 'git remote update' using 'git fetch' builtin-fetch: add --dry-run option builtin-fetch: add --prune option teach warn_dangling_symref to take a FILE argument remote: refactor some logic into get_stale_heads() Add missing test for 'git remote update --prune' Add the configuration option skipFetchAll Teach the --multiple option to 'git fetch' Teach the --all option to 'git fetch'
Diffstat (limited to 'Documentation/pull-fetch-param.txt')
-rw-r--r--Documentation/pull-fetch-param.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt
index 44d936341f..0551ebdfaf 100644
--- a/Documentation/pull-fetch-param.txt
+++ b/Documentation/pull-fetch-param.txt
@@ -4,6 +4,13 @@
(see the section <<URLS,GIT URLS>> below) or the name
of a remote (see the section <<REMOTES,REMOTES>> below).
+ifndef::git-pull[]
+<group>::
+ A name referring to a list of repositories as the value
+ of remotes.<group> in the configuration file.
+ (See linkgit:git-config[1]).
+endif::git-pull[]
+
<refspec>::
The format of a <refspec> parameter is an optional plus
`{plus}`, followed by the source ref <src>, followed