summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-31 17:23:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-31 17:23:55 (GMT)
commitc477553b2f4f621216b25800e121af52e0750087 (patch)
tree9471bdd9502427155e8b184535eb5257abfd5fac /Documentation/config.txt
parentab11903225270be7001b8c92f6ac4e165eaf4ecf (diff)
parent57283291b55cdc4ab726231073450d185beb361a (diff)
downloadgit-c477553b2f4f621216b25800e121af52e0750087.zip
git-c477553b2f4f621216b25800e121af52e0750087.tar.gz
git-c477553b2f4f621216b25800e121af52e0750087.tar.bz2
Merge branch 'maint' of git://linux-nfs.org/~bfields/git
* 'maint' of git://linux-nfs.org/~bfields/git: Documentation/user-manual.txt: fix typo Documentation: fix remote.<name>.skipDefaultUpdate description
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index ee08845..e1eaee9 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -757,7 +757,7 @@ remote.<name>.push::
remote.<name>.skipDefaultUpdate::
If true, this remote will be skipped by default when updating
- using the remote subcommand of gitlink:git-remote[1].
+ using the update subcommand of gitlink:git-remote[1].
remote.<name>.receivepack::
The default program to execute on the remote side when pushing. See