From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Apr 2012 19:39:17 +0000 (-0700)
Subject: Merge branch 'ms/remote-usage-string'
X-Git-Tag: v1.7.11-rc0~131
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/29a03fa5625433e5fc90da2f823b4277960537ae?ds=inline;hp=-c

Merge branch 'ms/remote-usage-string'

Adds some subcommands that were not listed in "git remote --help"
usage strings.

As an independent follow-up, we may want to rethink how the overall
usage string and subcommand usage strings are maintained.

By Michael Schubert
* ms/remote-usage-string:
remote: update builtin usage
---

29a03fa5625433e5fc90da2f823b4277960537ae
diff --combined builtin/remote.c
index fec92bc66e,8904d4b8e0..b5645fe0ae
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@@ -9,7 -9,7 +9,7 @@@
  
  static const char * const builtin_remote_usage[] = {
  	"git remote [-v | --verbose]",
- 	"git remote add [-t <branch>] [-m <master>] [-f] [--mirror=<fetch|push>] <name> <url>",
+ 	"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <name> <url>",
  	"git remote rename <old> <new>",
  	"git remote rm <name>",
  	"git remote set-head <name> (-a | -d | <branch>)",
@@@ -17,7 -17,7 +17,7 @@@
  	"git remote prune [-n | --dry-run] <name>",
  	"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]",
  	"git remote set-branches [--add] <name> <branch>...",
- 	"git remote set-url <name> <newurl> [<oldurl>]",
+ 	"git remote set-url [--push] <name> <newurl> [<oldurl>]",
  	"git remote set-url --add <name> <newurl>",
  	"git remote set-url --delete <name> <url>",
  	NULL
@@@ -534,7 -534,7 +534,7 @@@ static int add_branch_for_removal(cons
  	}
  
  	/* don't delete non-remote-tracking refs */
 -	if (prefixcmp(refname, "refs/remotes")) {
 +	if (prefixcmp(refname, "refs/remotes/")) {
  		/* advise user how to delete local branches */
  		if (!prefixcmp(refname, "refs/heads/"))
  			string_list_append(branches->skipped,