On Thu, Nov 19, 2009 at 1:10 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Tim Henigan <tim.henigan@xxxxxxxxx> writes: > >> The original version of this patch [1] left the contents of the usage >> strings intact. However, Junio expressed a preference to change >> them to use the generic <options>. See this thread for the >> discussion [2]. >> >> [1] http://article.gmane.org/gmane.comp.version-control.git/133048/ >> [2] http://thread.gmane.org/gmane.comp.version-control.git/132968/focus=133050 > > Sorry, but I think you misunderstood what I meant, then. in [2], I said... ... snip ... > ... the options list is used to reproduce the information in a major part > of that string already. So I would prefer builtin_remote_add_usage[] to > be something like: > > "git remote add [<options>...] <name> <url>" > > I meant that we want to change "remote add -h" to show this here; and the > reason why I doubted "the value of reusing option string" was because I > wanted to do so without touching the concise list of the subcommands and > their options given by "remote -h". Otherwise, it would have made perfect > sense to use preprocessor macros to share the two identical strings. Okay, I believe I understand now, but let's test that theory ;) Using the 'add' subcommand as an example, the desired output is: Output of 'git remote -h': "git remote [-v | --verbose]" "git remote add [-t <branch>] [-m <master>] [-f] [--mirror] <name> <url>" etc. Output of 'git remote add -h': "git remote add [<options>...] <name> <url>" followed by the detailed description given by 'parse_options()'. Text in 'man git-remote': "git remote add [-t <branch>] [-m <master>] [-f] [--mirror] <name> <url>" with the options explained in detail later in the file. Thanks for your patience, Tim -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html