aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-05-01 15:24:01 -0700
committerJunio C Hamano <gitster@pobox.com>2013-05-01 15:24:01 -0700
commitc259a1a927016fa5b80e3a7055031430cbdfddb8 (patch)
tree841a389391b80df690c30fb64792a068c49940fc /Documentation
parentb9347eb224d7b38f29893e75b6ca16a61647a4f2 (diff)
parentb17dd3f9d6b1657b3fbfb40a863fc2dce5f54798 (diff)
downloadgit-c259a1a927016fa5b80e3a7055031430cbdfddb8.tar.gz
git-c259a1a927016fa5b80e3a7055031430cbdfddb8.tar.xz
Merge branch 'tr/remote-tighten-commandline-parsing'
* tr/remote-tighten-commandline-parsing: remote: 'show' and 'prune' can take more than one remote remote: check for superfluous arguments in 'git remote add' remote: add a test for extra arguments, according to docs
Diffstat (limited to 'Documentation')
-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 e8c396b5f..7a6f35468 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -18,8 +18,8 @@ SYNOPSIS
'git remote set-url' [--push] <name> <newurl> [<oldurl>]
'git remote set-url --add' [--push] <name> <newurl>
'git remote set-url --delete' [--push] <name> <url>
-'git remote' [-v | --verbose] 'show' [-n] <name>
-'git remote prune' [-n | --dry-run] <name>
+'git remote' [-v | --verbose] 'show' [-n] <name>...
+'git remote prune' [-n | --dry-run] <name>...
'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]
DESCRIPTION