summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt4
-rw-r--r--Documentation/git-remote.txt10
2 files changed, 13 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 38655350f2..d8e696f4cd 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -439,6 +439,10 @@ pull.octopus::
pull.twohead::
The default merge strategy to use when pulling a single branch.
+remote.fetch::
+ The list of remotes which are fetched by "git remote update".
+ See gitlink:git-remote[1].
+
remote.<name>.url::
The URL of a remote repository. See gitlink:git-fetch[1] or
gitlink:git-push[1].
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index a60c31a315..06ba2e6f26 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -13,6 +13,7 @@ SYNOPSIS
'git-remote' add <name> <url>
'git-remote' show <name>
'git-remote' prune <name>
+'git-remote' update
DESCRIPTION
-----------
@@ -40,7 +41,14 @@ Gives some information about the remote <name>.
Deletes all stale tracking branches under <name>.
These stale branches have already been removed from the remote repository
-referenced by <name>, but are still locally available in "remotes/<name>".
+referenced by <name>, but are still locally available in
+"remotes/<name>".
+
+'update'::
+
+Fetch updates for the remotes in the repository. By default all remotes
+are updated, but this can be configured via the configuration parameter
+'remote.fetch'. (See gitlink:git-config[1]).
DISCUSSION