summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-03 13:51:53 -0800
committerJunio C Hamano <gitster@pobox.com>2009-12-03 13:51:53 -0800
commite24bd95879dbaf2a6232e7f621b0bab545319209 (patch)
treedf0fc15cd515bfc5a3101e99befed1d69292b848 /Documentation
parent9c1506af6ae953f54e11ce6a326bf0cd21de2b67 (diff)
parent4504107d5ef6a8840aaf278e63722bf4efbf722e (diff)
downloadgit-e24bd95879dbaf2a6232e7f621b0bab545319209.tar.gz
Merge branch 'th/remote-usage' into maint
* th/remote-usage: git remote: Separate usage strings for subcommands
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-remote.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 82a3d29673..c272c92d4b 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -13,10 +13,10 @@ SYNOPSIS
'git remote add' [-t <branch>] [-m <master>] [-f] [--mirror] <name> <url>
'git remote rename' <old> <new>
'git remote rm' <name>
-'git remote set-head' <name> [-a | -d | <branch>]
-'git remote show' [-n] <name>
+'git remote set-head' <name> (-a | -d | <branch>)
+'git remote' [-v | --verbose] 'show' [-n] <name>
'git remote prune' [-n | --dry-run] <name>
-'git remote update' [-p | --prune] [group | remote]...
+'git remote' [-v | --verbose] 'update' [-p | --prune] [group | remote]...
DESCRIPTION
-----------
@@ -30,6 +30,7 @@ OPTIONS
-v::
--verbose::
Be a little more verbose and show remote url after name.
+ NOTE: This must be placed between `remote` and `subcommand`.
COMMANDS