summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-23 13:30:00 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-23 13:30:00 -0800
commitbba612300149bacd3d0643d13ffa66b49185d151 (patch)
tree9e6679c44888e8a7f450b60a546524541a7571cc /Documentation
parentMerge branch 'tr/perftest' (diff)
parentremote: fix set-branches usage and documentation (diff)
downloadtgif-bba612300149bacd3d0643d13ffa66b49185d151.tar.xz
Merge branch 'pj/remote-set-branches-usage-fix'
* pj/remote-set-branches-usage-fix: remote: fix set-branches usage and documentation Conflicts: builtin/remote.c
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-remote.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 5a8c5061f3..d376d19ef7 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -14,7 +14,7 @@ SYNOPSIS
'git remote rename' <old> <new>
'git remote rm' <name>
'git remote set-head' <name> (-a | -d | <branch>)
-'git remote set-branches' <name> [--add] <branch>...
+'git remote set-branches' [--add] <name> <branch>...
'git remote set-url' [--push] <name> <newurl> [<oldurl>]
'git remote set-url --add' [--push] <name> <newurl>
'git remote set-url --delete' [--push] <name> <url>