Merge branch 'jc/remote-setbranches-usage-fix'

gitster · gitster · commit d7a0129b3cf4 · 2011-11-08T16:40:31.000-08:00
* jc/remote-setbranches-usage-fix:
  remote: fix set-branches usage
diff --git a/builtin/remote.c b/builtin/remote.c
@@ -1399,7 +1399,7 @@ static int set_branches(int argc, const char **argv)
 			     builtin_remote_setbranches_usage, 0);
 	if (argc == 0) {
 		error("no remote specified");
-		usage_with_options(builtin_remote_seturl_usage, options);
+		usage_with_options(builtin_remote_setbranches_usage, options);
 	}
 	argv[argc] = NULL;
 

Original file line number	Diff line number	Diff line change
`@@ -1399,7 +1399,7 @@ static int set_branches(int argc, const char **argv)`
`1399`	`1399`	`builtin_remote_setbranches_usage, 0);`
`1400`	`1400`	`if (argc == 0) {`
`1401`	`1401`	`error("no remote specified");`
`1402`		`- usage_with_options(builtin_remote_seturl_usage, options);`
	`1402`	`+ usage_with_options(builtin_remote_setbranches_usage, options);`
`1403`	`1403`	`}`
`1404`	`1404`	`argv[argc] = NULL;`
`1405`	`1405`