summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-06-04 12:39:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-04 12:39:49 (GMT)
commit643a9ea3e0d2937155bbce43e17bb132dc7166ff (patch)
tree45eaa9be55a2642b46cc7a48591f9e4c6ca9196c
parentf635b8d17b673ffb96c0f10d11751500e1892b2a (diff)
parenta97447a42a199c4f359608721c82e88cefb43a8e (diff)
downloadgit-643a9ea3e0d2937155bbce43e17bb132dc7166ff.zip
git-643a9ea3e0d2937155bbce43e17bb132dc7166ff.tar.gz
git-643a9ea3e0d2937155bbce43e17bb132dc7166ff.tar.bz2
Merge branch 'nd/remote-update-doc'
"git remote update" can take both a single remote nickname and a nickname for remote groups, but only one of them was documented. * nd/remote-update-doc: remote: doc typofix remote.txt: update documentation for 'update' command
-rw-r--r--Documentation/git-remote.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 595948d..0cad37f 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -186,8 +186,8 @@ actually prune them.
'update'::
-Fetch updates for a named set of remotes in the repository as defined by
-remotes.<group>. If a named group is not specified on the command line,
+Fetch updates for remotes or remote groups in the repository as defined by
+remotes.<group>. If neither group nor remote is specified on the command line,
the configuration parameter remotes.default will be used; if
remotes.default is not defined, all remotes which do not have the
configuration parameter remote.<name>.skipDefaultUpdate set to true will