summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-27 23:33:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-27 23:33:33 (GMT)
commit67f8d5b87d8ec3dcdb311f31b534332b74c93142 (patch)
tree6d77a87d8ca5045d0e539e3444b25be830115cd4 /Documentation
parente22c522730b0fc1dd2a1f12b6e508c5fb2e0fe6c (diff)
parentca5bc9e61fb26969c9b028c9b853af109f9f00c5 (diff)
downloadgit-67f8d5b87d8ec3dcdb311f31b534332b74c93142.zip
git-67f8d5b87d8ec3dcdb311f31b534332b74c93142.tar.gz
git-67f8d5b87d8ec3dcdb311f31b534332b74c93142.tar.bz2
Merge branch 'pj/remote-set-branches-usage-fix' into maint
* 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 5a8c506..d376d19 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>