{"thread":{"id":"26497","subject":"[PATCH 0/7] Cleaning up --help-all inconsistencies","startedAt":"2011-02-14T15:10:28Z","lastAt":"2011-02-17T07:48:06Z","messageCount":36,"participants":["Michael J Gruber","Johannes Sixt","Junio C Hamano","Sverre Rabbelier","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":7},"messages":[{"id":"161054","messageId":"cover.1297695910.git.git@drmicha.warpmail.net","threadId":"26497","inReplyTo":null,"subject":"[PATCH 0/7] Cleaning up --help-all inconsistencies","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-14T15:10:28Z","receivedAt":"2011-02-14T15:10:28Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"While looking at our use of short options, I noticed that several\nidentical options are described differently in --help-all output of\ndifferent commands. This mini series fixes this up. I also smuggled in a\npatch to git-tag.txt, whose description section is worded as if \"create\"\nwas the only mode (and thus makes incorrect statements about options).\n\nMichael J Gruber (7):\n commit,tag: use same wording for -F\n push: describe --porcelain just like commit and status\n clone,init: describe --template using the same wording\n merge,tag: describe -m just like commit\n add: describe --patch like checkout, reset\n commit,status: describe -u likewise\n git-tag.txt: list all modes in the description\n\n Documentation/git-tag.txt | 8 +++++++-\n builtin/add.c | 2 +-\n builtin/clone.c | 4 ++--\n builtin/commit.c | 4 ++--\n builtin/init-db.c | 2 +-\n builtin/merge.c | 4 ++--\n builtin/push.c | 2 +-\n builtin/tag.c | 6 +++---\n 8 files changed, 19 insertions(+), 13 deletions(-)\n\n-- \n1.7.4.1.74.gf39475\n"},{"id":"161055","messageId":"bf5f004bd55e91e5491b0ac68237d8b98ef0c691.1297695910.git.git@drmicha.warpmail.net","threadId":"26497","inReplyTo":"cover.1297695910.git.git@drmicha.warpmail.net","subject":"[PATCH 1/7] commit,tag: use same wording for -F","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-14T15:10:29Z","receivedAt":"2011-02-14T15:10:29Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Signed-off-by: Michael J Gruber \n---\n builtin/commit.c | 2 +-\n builtin/tag.c | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 03cff5a..8a534de 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -118,7 +118,7 @@ static struct option builtin_commit_options[] = {\n \tOPT__VERBOSE(&verbose, \"show diff in commit message template\"),\n \n \tOPT_GROUP(\"Commit message options\"),\n-\tOPT_FILENAME('F', \"file\", &logfile, \"read log from file\"),\n+\tOPT_FILENAME('F', \"file\", &logfile, \"read message from file\"),\n \tOPT_STRING(0, \"author\", &force_author, \"AUTHOR\", \"override author for commit\"),\n \tOPT_STRING(0, \"date\", &force_date, \"DATE\", \"override date for commit\"),\n \tOPT_CALLBACK('m', \"message\", &message, \"MESSAGE\", \"specify commit message\", opt_parse_m),\ndiff --git a/builtin/tag.c b/builtin/tag.c\nindex aa1f87d..6408171 100644\n--- a/builtin/tag.c\n+++ b/builtin/tag.c\n@@ -378,7 +378,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)\n \t\t\t\t\t\"annotated tag, needs a message\"),\n \t\tOPT_CALLBACK('m', NULL, &msg, \"msg\",\n \t\t\t \"message for the tag\", parse_msg_arg),\n-\t\tOPT_FILENAME('F', NULL, &msgfile, \"message in a file\"),\n+\t\tOPT_FILENAME('F', NULL, &msgfile, \"read message from file\"),\n \t\tOPT_BOOLEAN('s', NULL, &sign, \"annotated and GPG-signed tag\"),\n \t\tOPT_STRING('u', NULL, &keyid, \"key-id\",\n \t\t\t\t\t\"use another key to sign the tag\"),\n-- \n1.7.4.1.74.gf39475\n"},{"id":"161057","messageId":"3b6a87b585eea1722bd31bc9cf5ba2c80e37aefa.1297695910.git.git@drmicha.warpmail.net","threadId":"26497","inReplyTo":"cover.1297695910.git.git@drmicha.warpmail.net","subject":"[PATCH 2/7] push: describe --porcelain just like commit and status","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-14T15:10:30Z","receivedAt":"2011-02-14T15:10:30Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Signed-off-by: Michael J Gruber \n---\n builtin/push.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/builtin/push.c b/builtin/push.c\nindex e655eb7..e4ff264 100644\n--- a/builtin/push.c\n+++ b/builtin/push.c\n@@ -217,7 +217,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)\n \t\tOPT_BOOLEAN( 0, \"delete\", &deleterefs, \"delete refs\"),\n \t\tOPT_BOOLEAN( 0 , \"tags\", &tags, \"push tags (can't be used with --all or --mirror)\"),\n \t\tOPT_BIT('n' , \"dry-run\", &flags, \"dry run\", TRANSPORT_PUSH_DRY_RUN),\n-\t\tOPT_BIT( 0, \"porcelain\", &flags, \"machine-readable output\", TRANSPORT_PUSH_PORCELAIN),\n+\t\tOPT_BIT( 0, \"porcelain\", &flags, \"show porcelain output format\", TRANSPORT_PUSH_PORCELAIN),\n \t\tOPT_BIT('f', \"force\", &flags, \"force updates\", TRANSPORT_PUSH_FORCE),\n \t\tOPT_BOOLEAN( 0 , \"thin\", &thin, \"use thin pack\"),\n \t\tOPT_STRING( 0 , \"receive-pack\", &receivepack, \"receive-pack\", \"receive pack program\"),\n-- \n1.7.4.1.74.gf39475\n"},{"id":"161056","messageId":"4f337165179d071d7c54b442b7d3dd72406239b2.1297695910.git.git@drmicha.warpmail.net","threadId":"26497","inReplyTo":"cover.1297695910.git.git@drmicha.warpmail.net","subject":"[PATCH 3/7] clone,init: describe --template using the same wording","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-14T15:10:31Z","receivedAt":"2011-02-14T15:10:31Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"This also corrects a wrong description for clone.\n\nSigned-off-by: Michael J Gruber \n---\n builtin/clone.c | 4 ++--\n builtin/init-db.c | 2 +-\n 2 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin/clone.c b/builtin/clone.c\nindex 82a6938..60d9a64 100644\n--- a/builtin/clone.c\n+++ b/builtin/clone.c\n@@ -68,8 +68,8 @@ static struct option builtin_clone_options[] = {\n \t\t \"initialize submodules in the clone\"),\n \tOPT_BOOLEAN(0, \"recurse-submodules\", &option_recursive,\n \t\t \"initialize submodules in the clone\"),\n-\tOPT_STRING(0, \"template\", &option_template, \"path\",\n-\t\t \"path the template repository\"),\n+\tOPT_STRING(0, \"template\", &option_template, \"template-directory\",\n+\t\t \"directory from which templates will be used\"),\n \tOPT_STRING(0, \"reference\", &option_reference, \"repo\",\n \t\t \"reference repository\"),\n \tOPT_STRING('o', \"origin\", &option_origin, \"branch\",\ndiff --git a/builtin/init-db.c b/builtin/init-db.c\nindex e3af9ea..4f5348e 100644\n--- a/builtin/init-db.c\n+++ b/builtin/init-db.c\n@@ -419,7 +419,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)\n \tunsigned int flags = 0;\n \tconst struct option init_db_options[] = {\n \t\tOPT_STRING(0, \"template\", &template_dir, \"template-directory\",\n-\t\t\t\t\"provide the directory from which templates will be used\"),\n+\t\t\t\t\"directory from which templates will be used\"),\n \t\tOPT_SET_INT(0, \"bare\", &is_bare_repository_cfg,\n \t\t\t\t\"create a bare repository\", 1),\n \t\t{ OPTION_CALLBACK, 0, \"shared\", &init_shared_repository,\n-- \n1.7.4.1.74.gf39475\n"},{"id":"161060","messageId":"5d55b72b16f3d2def5fa955862fe5be6ff9f82f7.1297695910.git.git@drmicha.warpmail.net","threadId":"26497","inReplyTo":"cover.1297695910.git.git@drmicha.warpmail.net","subject":"[PATCH 4/7] merge,tag: describe -m just like commit","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-14T15:10:32Z","receivedAt":"2011-02-14T15:10:32Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"This also removes the misleading \"if any\" which sounds as if omitting\n\"-m\" would omit the commmit message. (It meant to mean \"if a merge\ncommit is created at all\".)\n\nSigned-off-by: Michael J Gruber \n---\n builtin/merge.c | 4 ++--\n builtin/tag.c | 4 ++--\n 2 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/builtin/merge.c b/builtin/merge.c\nindex 9403747..cbbd053 100644\n--- a/builtin/merge.c\n+++ b/builtin/merge.c\n@@ -194,8 +194,8 @@ static struct option builtin_merge_options[] = {\n \t\t\"merge strategy to use\", option_parse_strategy),\n \tOPT_CALLBACK('X', \"strategy-option\", &xopts, \"option=value\",\n \t\t\"option for selected merge strategy\", option_parse_x),\n-\tOPT_CALLBACK('m', \"message\", &merge_msg, \"message\",\n-\t\t\"message to be used for the merge commit (if any)\",\n+\tOPT_CALLBACK('m', \"message\", &merge_msg, \"MESSAGE\",\n+\t\t\"specify merge commit message\",\n \t\toption_parse_message),\n \tOPT__VERBOSITY(&verbosity),\n \tOPT_BOOLEAN(0, \"abort\", &abort_current_merge,\ndiff --git a/builtin/tag.c b/builtin/tag.c\nindex 6408171..e135717 100644\n--- a/builtin/tag.c\n+++ b/builtin/tag.c\n@@ -376,8 +376,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)\n \t\tOPT_GROUP(\"Tag creation options\"),\n \t\tOPT_BOOLEAN('a', NULL, &annotate,\n \t\t\t\t\t\"annotated tag, needs a message\"),\n-\t\tOPT_CALLBACK('m', NULL, &msg, \"msg\",\n-\t\t\t \"message for the tag\", parse_msg_arg),\n+\t\tOPT_CALLBACK('m', NULL, &msg, \"MESSAGE\",\n+\t\t\t \"specify tag message\", parse_msg_arg),\n \t\tOPT_FILENAME('F', NULL, &msgfile, \"read message from file\"),\n \t\tOPT_BOOLEAN('s', NULL, &sign, \"annotated and GPG-signed tag\"),\n \t\tOPT_STRING('u', NULL, &keyid, \"key-id\",\n-- \n1.7.4.1.74.gf39475\n"},{"id":"161058","messageId":"569a9ad6f3392cc3a2a46375237032ce411666aa.1297695910.git.git@drmicha.warpmail.net","threadId":"26497","inReplyTo":"cover.1297695910.git.git@drmicha.warpmail.net","subject":"[PATCH 5/7] add: describe --patch like checkout, reset","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-14T15:10:33Z","receivedAt":"2011-02-14T15:10:33Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Signed-off-by: Michael J Gruber \n---\n builtin/add.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/builtin/add.c b/builtin/add.c\nindex 5f817ad..f8e51f9 100644\n--- a/builtin/add.c\n+++ b/builtin/add.c\n@@ -317,7 +317,7 @@ static struct option builtin_add_options[] = {\n \tOPT__VERBOSE(&verbose, \"be verbose\"),\n \tOPT_GROUP(\"\"),\n \tOPT_BOOLEAN('i', \"interactive\", &add_interactive, \"interactive picking\"),\n-\tOPT_BOOLEAN('p', \"patch\", &patch_interactive, \"interactive patching\"),\n+\tOPT_BOOLEAN('p', \"patch\", &patch_interactive, \"select hunks interactively\"),\n \tOPT_BOOLEAN('e', \"edit\", &edit_interactive, \"edit current diff and apply\"),\n \tOPT__FORCE(&ignored_too, \"allow adding otherwise ignored files\"),\n \tOPT_BOOLEAN('u', \"update\", &take_worktree_changes, \"update tracked files\"),\n-- \n1.7.4.1.74.gf39475\n"},{"id":"161059","messageId":"959cfaee441413401ddb7ad7fd29f4a98f668bec.1297695910.git.git@drmicha.warpmail.net","threadId":"26497","inReplyTo":"cover.1297695910.git.git@drmicha.warpmail.net","subject":"[PATCH 6/7] commit,status: describe -u likewise","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-14T15:10:34Z","receivedAt":"2011-02-14T15:10:34Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"They differ by one character only. Being exactly equal should help\ntranslations.\n\nSigned-off-by: Michael J Gruber \n---\n builtin/commit.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 8a534de..ef2114b 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -150,7 +150,7 @@ static struct option builtin_commit_options[] = {\n \t\t \"terminate entries with NUL\"),\n \tOPT_BOOLEAN(0, \"amend\", &amend, \"amend previous commit\"),\n \tOPT_BOOLEAN(0, \"no-post-rewrite\", &no_post_rewrite, \"bypass post-rewrite hook\"),\n-\t{ OPTION_STRING, 'u', \"untracked-files\", &untracked_files_arg, \"mode\", \"show untracked files, optional modes: all, normal, no (Default: all)\", PARSE_OPT_OPTARG, NULL, (intptr_t)\"all\" },\n+\t{ OPTION_STRING, 'u', \"untracked-files\", &untracked_files_arg, \"mode\", \"show untracked files, optional modes: all, normal, no. (Default: all)\", PARSE_OPT_OPTARG, NULL, (intptr_t)\"all\" },\n \t/* end commit contents options */\n \n \t{ OPTION_BOOLEAN, 0, \"allow-empty\", &allow_empty, NULL,\n-- \n1.7.4.1.74.gf39475\n"},{"id":"161061","messageId":"496c871d087c0677ddd3374d432e56c891375025.1297695910.git.git@drmicha.warpmail.net","threadId":"26497","inReplyTo":"cover.1297695910.git.git@drmicha.warpmail.net","subject":"[PATCH 7/7] git-tag.txt: list all modes in the description","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-14T15:10:35Z","receivedAt":"2011-02-14T15:10:35Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Currently, the description sounds as if it applied always, but most of\nits content is true in \"create tag mode\" only.\n\nMake this clearer by listing all modes and qualifying the main part.\n\nSigned-off-by: Michael J Gruber \n---\n Documentation/git-tag.txt | 8 +++++++-\n 1 files changed, 7 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt\nindex 8b169e3..c503f60 100644\n--- a/Documentation/git-tag.txt\n+++ b/Documentation/git-tag.txt\n@@ -18,7 +18,7 @@ SYNOPSIS\n DESCRIPTION\n -----------\n \n-Adds a tag reference in `.git/refs/tags/`.\n+Without `-d/-l/-v`: Adds a tag reference in `.git/refs/tags/`.\n \n Unless `-f` is given, the tag must not yet exist in\n `.git/refs/tags/` directory.\n@@ -39,6 +39,12 @@ A GnuPG signed tag object will be created when `-s` or `-u\n committer identity for the current user is used to find the\n GnuPG key for signing.\n \n+With `-d`: Deletes a tag.\n+\n+With `-l`: List tags.\n+\n+With `-v`: Verify tags.\n+\n OPTIONS\n -------\n -a::\n-- \n1.7.4.1.74.gf39475\n"},{"id":"161090","messageId":"201102142042.31887.j6t@kdbg.org","threadId":"26497","inReplyTo":"3b6a87b585eea1722bd31bc9cf5ba2c80e37aefa.1297695910.git.git@drmicha.warpmail.net","subject":"Re: [PATCH 2/7] push: describe --porcelain just like commit and status","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2011-02-14T19:42:31Z","receivedAt":"2011-02-14T19:42:31Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"On Montag, 14. Februar 2011, Michael J Gruber wrote:\n> -\t\tOPT_BIT( 0, \"porcelain\", &flags, \"machine-readable output\",... \nTRANSPORT_PUSH_PORCELAIN),\n> +\t\tOPT_BIT( 0, \"porcelain\", &flags, \"show porcelain output format\",...\n\nIMO, this is a step in the wrong direction. It is not at all clear \nthat \"--porcelain\" means \"output _for_ porcelain\"; it is much more likely to \nbe understood as \"output _is_ the porcelain\". Your new text even supports \nthis latter understanding. The original description \"machine-readable output\" \nis unambiguous and cannot be misunderstood.\n\n-- Hannes\n"},{"id":"161094","messageId":"7vr5bas8fv.fsf@alter.siamese.dyndns.org","threadId":"26497","inReplyTo":"bf5f004bd55e91e5491b0ac68237d8b98ef0c691.1297695910.git.git@drmicha.warpmail.net","subject":"Re: [PATCH 1/7] commit,tag: use same wording for -F","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-02-14T19:49:24Z","receivedAt":"2011-02-14T19:49:24Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michael J Gruber writes:\n\n> diff --git a/builtin/commit.c b/builtin/commit.c\n> index 03cff5a..8a534de 100644\n> --- a/builtin/commit.c\n> +++ b/builtin/commit.c\n> @@ -118,7 +118,7 @@ static struct option builtin_commit_options[] = {\n> ...\n> -\tOPT_FILENAME('F', \"file\", &logfile, \"read log from file\"),\n> +\tOPT_FILENAME('F', \"file\", &logfile, \"read message from file\"),\n> diff --git a/builtin/tag.c b/builtin/tag.c\n> index aa1f87d..6408171 100644\n> --- a/builtin/tag.c\n> +++ b/builtin/tag.c\n> @@ -378,7 +378,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)\n> ...\n> -\t\tOPT_FILENAME('F', NULL, &msgfile, \"message in a file\"),\n> +\t\tOPT_FILENAME('F', NULL, &msgfile, \"read message from file\"),\n\nMakes sense, thanks.\n"},{"id":"161096","messageId":"7vmxlys89t.fsf@alter.siamese.dyndns.org","threadId":"26497","inReplyTo":"3b6a87b585eea1722bd31bc9cf5ba2c80e37aefa.1297695910.git.git@drmicha.warpmail.net","subject":"Re: [PATCH 2/7] push: describe --porcelain just like commit and status","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-02-14T19:53:02Z","receivedAt":"2011-02-14T19:53:02Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michael J Gruber writes:\n\n> -\t\tOPT_BIT( 0, \"porcelain\", &flags, \"machine-readable output\", TRANSPORT_PUSH_PORCELAIN),\n> +\t\tOPT_BIT( 0, \"porcelain\", &flags, \"show porcelain output format\", TRANSPORT_PUSH_PORCELAIN),\n\nThanks, but I wonder if machine-readable is more descriptive than\n\"porcelain output format\", iow, updating commit/status may be better.\n\nThe option was meant to mean \"output format for Porcelain script writers\nto stay machine readable\" but it can be misunderstood as \"output format\na Porcelain command would produce with chromes and glitters\".\n"},{"id":"161097","messageId":"7vipwms886.fsf@alter.siamese.dyndns.org","threadId":"26497","inReplyTo":"4f337165179d071d7c54b442b7d3dd72406239b2.1297695910.git.git@drmicha.warpmail.net","subject":"Re: [PATCH 3/7] clone,init: describe --template using the same wording","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-02-14T19:54:01Z","receivedAt":"2011-02-14T19:54:01Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michael J Gruber writes:\n\n> This also corrects a wrong description for clone.\n>\n> Signed-off-by: Michael J Gruber \n> diff --git a/builtin/clone.c b/builtin/clone.c\n> index 82a6938..60d9a64 100644\n> --- a/builtin/clone.c\n> +++ b/builtin/clone.c\n> @@ -68,8 +68,8 @@ static struct option builtin_clone_options[] = {\n> ...\n> -\tOPT_STRING(0, \"template\", &option_template, \"path\",\n> -\t\t \"path the template repository\"),\n> +\tOPT_STRING(0, \"template\", &option_template, \"template-directory\",\n> +\t\t \"directory from which templates will be used\"),\n> diff --git a/builtin/init-db.c b/builtin/init-db.c\n> index e3af9ea..4f5348e 100644\n> --- a/builtin/init-db.c\n> +++ b/builtin/init-db.c\n> @@ -419,7 +419,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)\n> ...\n> -\t\t\t\t\"provide the directory from which templates will be used\"),\n> +\t\t\t\t\"directory from which templates will be used\"),\n\nMakes perfect sense; thanks.\n"},{"id":"161098","messageId":"7vei7as82n.fsf@alter.siamese.dyndns.org","threadId":"26497","inReplyTo":"959cfaee441413401ddb7ad7fd29f4a98f668bec.1297695910.git.git@drmicha.warpmail.net","subject":"Re: [PATCH 6/7] commit,status: describe -u likewise","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-02-14T19:57:20Z","receivedAt":"2011-02-14T19:57:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michael J Gruber writes:\n\n> They differ by one character only. Being exactly equal should help\n> translations.\n>\n> Signed-off-by: Michael J Gruber \n> ---\n> diff --git a/builtin/commit.c b/builtin/commit.c\n> index 8a534de..ef2114b 100644\n> --- a/builtin/commit.c\n> +++ b/builtin/commit.c\n> @@ -150,7 +150,7 @@ static struct option builtin_commit_options[] = {\n> ...\n> -\t{ OPTION_STRING, 'u', \"untracked-files\", &untracked_files_arg, \"mode\", \"show untracked files, optional modes: all, normal, no (Default: all)\", PARSE_OPT_OPTARG, NULL, (intptr_t)\"all\" },\n> +\t{ OPTION_STRING, 'u', \"untracked-files\", &untracked_files_arg, \"mode\", \"show untracked files, optional modes: all, normal, no. (Default: all)\", PARSE_OPT_OPTARG, NULL, (intptr_t)\"all\" },\n\nMakes sense; thanks.\n\nI however wonder if we have an opportunity for even more unifying these\ntwo arrays, typing the same thing only once.\n"},{"id":"161099","messageId":"7v8vxis7t1.fsf@alter.siamese.dyndns.org","threadId":"26497","inReplyTo":"496c871d087c0677ddd3374d432e56c891375025.1297695910.git.git@drmicha.warpmail.net","subject":"Re: [PATCH 7/7] git-tag.txt: list all modes in the description","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-02-14T20:03:06Z","receivedAt":"2011-02-14T20:03:06Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michael J Gruber writes:\n\n> Currently, the description sounds as if it applied always, but most of\n> its content is true in \"create tag mode\" only.\n>\n> Make this clearer by listing all modes and qualifying the main part.\n>\n> Signed-off-by: Michael J Gruber \n\nThanks for noticing; I agree with the basic idea.\n\n> diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt\n> index 8b169e3..c503f60 100644\n> --- a/Documentation/git-tag.txt\n> +++ b/Documentation/git-tag.txt\n> @@ -18,7 +18,7 @@ SYNOPSIS\n> ...\n> -Adds a tag reference in `.git/refs/tags/`.\n> +Without `-d/-l/-v`: Adds a tag reference in `.git/refs/tags/`.\n\nBut this leaves the reader in suspense what these three exceptions are for\nafter finishing the first sentence. How about rewording like this?\n\n Add a tag reference in `.git/refs/tags/`, unless `-d/-l/-v` is given\n to delete, list or verify.\n\nThen we don't need to repeat these three\n\n With `-d`: Deletes a tag.\n\n With `-l`: List tags.\n\n With `-v`: Verify tags.\n\nthat the readers would see in OPTIONS section fairly soon.\n"},{"id":"161100","messageId":"7v4o86s7km.fsf@alter.siamese.dyndns.org","threadId":"26497","inReplyTo":"5d55b72b16f3d2def5fa955862fe5be6ff9f82f7.1297695910.git.git@drmicha.warpmail.net","subject":"Re: [PATCH 4/7] merge,tag: describe -m just like commit","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-02-14T20:08:09Z","receivedAt":"2011-02-14T20:08:09Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michael J Gruber writes:\n\n> This also removes the misleading \"if any\" which sounds as if omitting\n> \"-m\" would omit the commmit message. (It meant to mean \"if a merge\n> commit is created at all\".)\n\nHmph, then don't we want to keep that in your clearer form, i.e.\n\n\tspecify merge commit message (if a merge is created at all)\n\nAn option is by definition to _specify_ something, \"specify\" is a waste of\nspace in a description of an option. E.g. in patch 3/7, --template option\nis described as \"directory from which templates will be used\", and not\n\"specify the directory from which...\".\n"},{"id":"161121","messageId":"AANLkTintLstPrvs_AqCixmXzRcrthfy+qAaPmve2oSu-@mail.gmail.com","threadId":"26497","inReplyTo":"7vmxlys89t.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 2/7] push: describe --porcelain just like commit and status","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2011-02-14T22:25:00Z","receivedAt":"2011-02-14T22:25:00Z","isPatch":true,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Mon, Feb 14, 2011 at 20:53, Junio C Hamano wrote:\n> The option was meant to mean \"output format for Porcelain script writers\n> to stay machine readable\" but it can be misunderstood as \"output format\n> a Porcelain command would produce with chromes and glitters\".\n\nI've always thought this to be a rather awkward option name. If it had\nbeen named '--plumbing' there'd be no room for such misunderstanding,\nit outputs it a format suitable for use by, and as plumbing. Perhaps\nsomething to remember for the future, or would we want to stay\nconsistent with the current --porcelain?\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"161151","messageId":"4D5A223F.6000605@drmicha.warpmail.net","threadId":"26497","inReplyTo":"7vmxlys89t.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 2/7] push: describe --porcelain just like commit and status","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-15T06:50:39Z","receivedAt":"2011-02-15T06:50:39Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Junio C Hamano venit, vidit, dixit 14.02.2011 20:53:\n> Michael J Gruber writes:\n> \n>> -\t\tOPT_BIT( 0, \"porcelain\", &flags, \"machine-readable output\", TRANSPORT_PUSH_PORCELAIN),\n>> +\t\tOPT_BIT( 0, \"porcelain\", &flags, \"show porcelain output format\", TRANSPORT_PUSH_PORCELAIN),\n> \n> Thanks, but I wonder if machine-readable is more descriptive than\n> \"porcelain output format\", iow, updating commit/status may be better.\n> \n> The option was meant to mean \"output format for Porcelain script writers\n> to stay machine readable\" but it can be misunderstood as \"output format\n> a Porcelain command would produce with chromes and glitters\".\n\nI'm happy with that, too. Generally, I tried to go with the majority\nwith this unifying series. In fact, we've been unhappy with the name of\nthat option as well, but the usage text is easier to change.\n\nMichael\n"},{"id":"161152","messageId":"4D5A22D3.2080605@warpmail.net","threadId":"26497","inReplyTo":"7vei7as82n.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 6/7] commit,status: describe -u likewise","fromName":"Michael J Gruber","fromEmail":"drmicha@warpmail.net","sentAt":"2011-02-15T06:53:07Z","receivedAt":"2011-02-15T06:53:07Z","isPatch":true,"sender":{"key":"drmicha@warpmail.net","avatar":null},"body":"Junio C Hamano venit, vidit, dixit 14.02.2011 20:57:\n> Michael J Gruber writes:\n> \n>> They differ by one character only. Being exactly equal should help\n>> translations.\n>>\n>> Signed-off-by: Michael J Gruber \n>> ---\n>> diff --git a/builtin/commit.c b/builtin/commit.c\n>> index 8a534de..ef2114b 100644\n>> --- a/builtin/commit.c\n>> +++ b/builtin/commit.c\n>> @@ -150,7 +150,7 @@ static struct option builtin_commit_options[] = {\n>> ...\n>> -\t{ OPTION_STRING, 'u', \"untracked-files\", &untracked_files_arg, \"mode\", \"show untracked files, optional modes: all, normal, no (Default: all)\", PARSE_OPT_OPTARG, NULL, (intptr_t)\"all\" },\n>> +\t{ OPTION_STRING, 'u', \"untracked-files\", &untracked_files_arg, \"mode\", \"show untracked files, optional modes: all, normal, no. (Default: all)\", PARSE_OPT_OPTARG, NULL, (intptr_t)\"all\" },\n> \n> Makes sense; thanks.\n> \n> I however wonder if we have an opportunity for even more unifying these\n> two arrays, typing the same thing only once.\n> \n\nI was surprised we have two arrays at all, \"status\" being \"commit\n--dry-run\". I'll check whether we can remove redundancy without too much\neffort.\n\nMichael\n"},{"id":"161155","messageId":"4D5A267B.7070902@drmicha.warpmail.net","threadId":"26497","inReplyTo":"7v4o86s7km.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 4/7] merge,tag: describe -m just like commit","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-15T07:08:43Z","receivedAt":"2011-02-15T07:08:43Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Junio C Hamano venit, vidit, dixit 14.02.2011 21:08:\n> Michael J Gruber writes:\n> \n>> This also removes the misleading \"if any\" which sounds as if omitting\n>> \"-m\" would omit the commmit message. (It meant to mean \"if a merge\n>> commit is created at all\".)\n> \n> Hmph, then don't we want to keep that in your clearer form, i.e.\n> \n> \tspecify merge commit message (if a merge is created at all)\n\nWell, any option is effective only in the case when the command succeeds\n- \"commit -m msg\" specifies only a message when a commit is created at\nall, etc. So, it usually is a trivial remark. It is slightly different\nfor merge because merge may succeed by doing a fast-forward without\ncreating a merge commit, which is why I wrote \"merge commit message\".\nSo, the parenthetical remark would have to be \"if a non-ff merge commit\nis created\". I'm afraid \"merge created\" alone would not convey this.\n\n> An option is by definition to _specify_ something, \"specify\" is a waste of\n> space in a description of an option. E.g. in patch 3/7, --template option\n> is described as \"directory from which templates will be used\", and not\n> \"specify the directory from which...\".\n\nOh yes, I tried to refrain from mixing other clean-up tasks with the\nunifying series, especially in the absence of (my knowledge about) an\noption \"style guide\". If \"--foo bar\" specifies that \"bar\" is used as\n\"baz\" then saying \"--foo : baz\" is enough and c/should be the\ngeneral rule. I'd be happy to incorporate this.\n\nMichael\n"},{"id":"161157","messageId":"20110215072148.GC28634@sigill.intra.peff.net","threadId":"26497","inReplyTo":"4D5A22D3.2080605@warpmail.net","subject":"Re: [PATCH 6/7] commit,status: describe -u likewise","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2011-02-15T07:21:48Z","receivedAt":"2011-02-15T07:21:48Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Feb 15, 2011 at 07:53:07AM +0100, Michael J Gruber wrote:\n\n> > I however wonder if we have an opportunity for even more unifying\n> > these two arrays, typing the same thing only once.\n> \n> I was surprised we have two arrays at all, \"status\" being \"commit\n> --dry-run\". I'll check whether we can remove redundancy without too\n> much effort.\n\nHmm, not according to 9e4b7ab (git status: not \"commit --dry-run\"\nanymore, 2009-08-15).\n\n\"Commit --dry-run\" more-or-less runs status on the index that would be\ncommitted. But it obviously takes a lot of options that status does not,\nand in theory status could take options that \"commit --dry-run\" does\nnot (certainly its non-option arguments are different these days, but\nparse_options doesn't care about that).\n\nI said \"in theory\" because I have no idea if such options exist yet or\nnot. But probably any refactoring should pull out the common options\ninto a shared list, and not simply make commit a superset of the status\noptions.\n\n-Peff\n"},{"id":"161179","messageId":"cover.1297774306.git.git@drmicha.warpmail.net","threadId":"26497","inReplyTo":"cover.1297695910.git.git@drmicha.warpmail.net","subject":"[PATCHv2 00/10] Cleaning up --help-all inconsistencies","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-15T13:09:03Z","receivedAt":"2011-02-15T13:09:03Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"v2 incorporates the changes as discussed so far.\nIt comes with three bonus patches which enforce the use of lowercase\n (as per CodingGuidelines) in command messages (usage).\nBesides the guidelines, this is also the prevailing style in code.\nDocumentation is a different issue.\n\npatches 1,3,5 are unchanged wrt v1.\n\nThe last 3 are divided according to the grep expressions which I used to\nidentify candidates.\n\nMichael J Gruber (10):\n commit,tag: use same wording for -F\n commit,status: describe --porcelain just like push\n clone,init: describe --template using the same wording\n commit,merge,tag: describe -m likewise\n add: describe --patch like checkout, reset\n commit,status: describe -u likewise\n git-tag.txt: list all modes in the description\n Make lowercase as per CodingGuidelines\n Make lowercase as per CodingGuidelines\n Make lowercase as per CodingGuidelines\n\n Documentation/git-tag.txt | 11 ++++++-----\n builtin/add.c | 2 +-\n builtin/clone.c | 4 ++--\n builtin/commit.c | 22 +++++++++++-----------\n builtin/config.c | 2 +-\n builtin/fast-export.c | 4 ++--\n builtin/fetch.c | 6 +++---\n builtin/init-db.c | 2 +-\n builtin/merge.c | 2 +-\n builtin/notes.c | 16 ++++++++--------\n builtin/read-tree.c | 4 ++--\n builtin/tag.c | 6 +++---\n parse-options.h | 2 +-\n t/t0040-parse-options.sh | 2 +-\n test-parse-options.c | 2 +-\n 15 files changed, 44 insertions(+), 43 deletions(-)\n\n-- \n1.7.4.1.74.gf39475.dirty\n"},{"id":"161180","messageId":"bf5f004bd55e91e5491b0ac68237d8b98ef0c691.1297775122.git.git@drmicha.warpmail.net","threadId":"26497","inReplyTo":"cover.1297695910.git.git@drmicha.warpmail.net","subject":"[PATCHv2 01/10] commit,tag: use same wording for -F","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-15T13:09:04Z","receivedAt":"2011-02-15T13:09:04Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Signed-off-by: Michael J Gruber \n---\n builtin/commit.c | 2 +-\n builtin/tag.c | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 03cff5a..8a534de 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -118,7 +118,7 @@ static struct option builtin_commit_options[] = {\n \tOPT__VERBOSE(&verbose, \"show diff in commit message template\"),\n \n \tOPT_GROUP(\"Commit message options\"),\n-\tOPT_FILENAME('F', \"file\", &logfile, \"read log from file\"),\n+\tOPT_FILENAME('F', \"file\", &logfile, \"read message from file\"),\n \tOPT_STRING(0, \"author\", &force_author, \"AUTHOR\", \"override author for commit\"),\n \tOPT_STRING(0, \"date\", &force_date, \"DATE\", \"override date for commit\"),\n \tOPT_CALLBACK('m', \"message\", &message, \"MESSAGE\", \"specify commit message\", opt_parse_m),\ndiff --git a/builtin/tag.c b/builtin/tag.c\nindex aa1f87d..6408171 100644\n--- a/builtin/tag.c\n+++ b/builtin/tag.c\n@@ -378,7 +378,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)\n \t\t\t\t\t\"annotated tag, needs a message\"),\n \t\tOPT_CALLBACK('m', NULL, &msg, \"msg\",\n \t\t\t \"message for the tag\", parse_msg_arg),\n-\t\tOPT_FILENAME('F', NULL, &msgfile, \"message in a file\"),\n+\t\tOPT_FILENAME('F', NULL, &msgfile, \"read message from file\"),\n \t\tOPT_BOOLEAN('s', NULL, &sign, \"annotated and GPG-signed tag\"),\n \t\tOPT_STRING('u', NULL, &keyid, \"key-id\",\n \t\t\t\t\t\"use another key to sign the tag\"),\n-- \n1.7.4.1.74.gf39475.dirty\n"},{"id":"161181","messageId":"63efeb23823550448978cf9adb2ee9fdc6469877.1297775122.git.git@drmicha.warpmail.net","threadId":"26497","inReplyTo":"cover.1297695910.git.git@drmicha.warpmail.net","subject":"[PATCHv2 02/10] commit,status: describe --porcelain just like push","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-15T13:09:05Z","receivedAt":"2011-02-15T13:09:05Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Push has the clearer description, so take that one for all.\n\nSigned-off-by: Michael J Gruber \n---\n builtin/commit.c | 4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 8a534de..0245d9f 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -145,7 +145,7 @@ static struct option builtin_commit_options[] = {\n \t\t STATUS_FORMAT_SHORT),\n \tOPT_BOOLEAN(0, \"branch\", &status_show_branch, \"show branch information\"),\n \tOPT_SET_INT(0, \"porcelain\", &status_format,\n-\t\t \"show porcelain output format\", STATUS_FORMAT_PORCELAIN),\n+\t\t \"machine-readable output\", STATUS_FORMAT_PORCELAIN),\n \tOPT_BOOLEAN('z', \"null\", &null_termination,\n \t\t \"terminate entries with NUL\"),\n \tOPT_BOOLEAN(0, \"amend\", &amend, \"amend previous commit\"),\n@@ -1092,7 +1092,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)\n \t\tOPT_BOOLEAN('b', \"branch\", &status_show_branch,\n \t\t\t \"show branch information\"),\n \t\tOPT_SET_INT(0, \"porcelain\", &status_format,\n-\t\t\t \"show porcelain output format\",\n+\t\t\t \"machine-readable output\",\n \t\t\t STATUS_FORMAT_PORCELAIN),\n \t\tOPT_BOOLEAN('z', \"null\", &null_termination,\n \t\t\t \"terminate entries with NUL\"),\n-- \n1.7.4.1.74.gf39475.dirty\n"},{"id":"161182","messageId":"731361315447fab6e18f5ab582bca97de479019e.1297775122.git.git@drmicha.warpmail.net","threadId":"26497","inReplyTo":"cover.1297695910.git.git@drmicha.warpmail.net","subject":"[PATCHv2 03/10] clone,init: describe --template using the same wording","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-15T13:09:06Z","receivedAt":"2011-02-15T13:09:06Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"This also corrects a wrong description for clone.\n\nSigned-off-by: Michael J Gruber \n---\n builtin/clone.c | 4 ++--\n builtin/init-db.c | 2 +-\n 2 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin/clone.c b/builtin/clone.c\nindex 82a6938..60d9a64 100644\n--- a/builtin/clone.c\n+++ b/builtin/clone.c\n@@ -68,8 +68,8 @@ static struct option builtin_clone_options[] = {\n \t\t \"initialize submodules in the clone\"),\n \tOPT_BOOLEAN(0, \"recurse-submodules\", &option_recursive,\n \t\t \"initialize submodules in the clone\"),\n-\tOPT_STRING(0, \"template\", &option_template, \"path\",\n-\t\t \"path the template repository\"),\n+\tOPT_STRING(0, \"template\", &option_template, \"template-directory\",\n+\t\t \"directory from which templates will be used\"),\n \tOPT_STRING(0, \"reference\", &option_reference, \"repo\",\n \t\t \"reference repository\"),\n \tOPT_STRING('o', \"origin\", &option_origin, \"branch\",\ndiff --git a/builtin/init-db.c b/builtin/init-db.c\nindex e3af9ea..4f5348e 100644\n--- a/builtin/init-db.c\n+++ b/builtin/init-db.c\n@@ -419,7 +419,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)\n \tunsigned int flags = 0;\n \tconst struct option init_db_options[] = {\n \t\tOPT_STRING(0, \"template\", &template_dir, \"template-directory\",\n-\t\t\t\t\"provide the directory from which templates will be used\"),\n+\t\t\t\t\"directory from which templates will be used\"),\n \t\tOPT_SET_INT(0, \"bare\", &is_bare_repository_cfg,\n \t\t\t\t\"create a bare repository\", 1),\n \t\t{ OPTION_CALLBACK, 0, \"shared\", &init_shared_repository,\n-- \n1.7.4.1.74.gf39475.dirty\n"},{"id":"161183","messageId":"4a14b88302dee7fc92d4dca88f13d4a5890dec3f.1297775122.git.git@drmicha.warpmail.net","threadId":"26497","inReplyTo":"cover.1297695910.git.git@drmicha.warpmail.net","subject":"[PATCHv2 04/10] commit,merge,tag: describe -m likewise","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-15T13:09:07Z","receivedAt":"2011-02-15T13:09:07Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"This also removes the superfluous \"specify\" and rewords the misleading\n\"if any\" which sounds as if omitting \"-m\" would omit the merge commit\nmessage. (It means \"if a merge commit is created at all\".)\n\nSigned-off-by: Michael J Gruber \n---\n builtin/commit.c | 2 +-\n builtin/merge.c | 4 ++--\n builtin/tag.c | 4 ++--\n 3 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 0245d9f..0090571 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -121,7 +121,7 @@ static struct option builtin_commit_options[] = {\n \tOPT_FILENAME('F', \"file\", &logfile, \"read message from file\"),\n \tOPT_STRING(0, \"author\", &force_author, \"AUTHOR\", \"override author for commit\"),\n \tOPT_STRING(0, \"date\", &force_date, \"DATE\", \"override date for commit\"),\n-\tOPT_CALLBACK('m', \"message\", &message, \"MESSAGE\", \"specify commit message\", opt_parse_m),\n+\tOPT_CALLBACK('m', \"message\", &message, \"MESSAGE\", \"commit message\", opt_parse_m),\n \tOPT_STRING('c', \"reedit-message\", &edit_message, \"COMMIT\", \"reuse and edit message from specified commit\"),\n \tOPT_STRING('C', \"reuse-message\", &use_message, \"COMMIT\", \"reuse message from specified commit\"),\n \tOPT_STRING(0, \"fixup\", &fixup_message, \"COMMIT\", \"use autosquash formatted message to fixup specified commit\"),\ndiff --git a/builtin/merge.c b/builtin/merge.c\nindex 9403747..8c58c3c 100644\n--- a/builtin/merge.c\n+++ b/builtin/merge.c\n@@ -194,8 +194,8 @@ static struct option builtin_merge_options[] = {\n \t\t\"merge strategy to use\", option_parse_strategy),\n \tOPT_CALLBACK('X', \"strategy-option\", &xopts, \"option=value\",\n \t\t\"option for selected merge strategy\", option_parse_x),\n-\tOPT_CALLBACK('m', \"message\", &merge_msg, \"message\",\n-\t\t\"message to be used for the merge commit (if any)\",\n+\tOPT_CALLBACK('m', \"message\", &merge_msg, \"MESSAGE\",\n+\t\t\"merge commit message (for a non-fast-forward merge)\",\n \t\toption_parse_message),\n \tOPT__VERBOSITY(&verbosity),\n \tOPT_BOOLEAN(0, \"abort\", &abort_current_merge,\ndiff --git a/builtin/tag.c b/builtin/tag.c\nindex 6408171..246a2bc 100644\n--- a/builtin/tag.c\n+++ b/builtin/tag.c\n@@ -376,8 +376,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)\n \t\tOPT_GROUP(\"Tag creation options\"),\n \t\tOPT_BOOLEAN('a', NULL, &annotate,\n \t\t\t\t\t\"annotated tag, needs a message\"),\n-\t\tOPT_CALLBACK('m', NULL, &msg, \"msg\",\n-\t\t\t \"message for the tag\", parse_msg_arg),\n+\t\tOPT_CALLBACK('m', NULL, &msg, \"MESSAGE\",\n+\t\t\t \"tag message\", parse_msg_arg),\n \t\tOPT_FILENAME('F', NULL, &msgfile, \"read message from file\"),\n \t\tOPT_BOOLEAN('s', NULL, &sign, \"annotated and GPG-signed tag\"),\n \t\tOPT_STRING('u', NULL, &keyid, \"key-id\",\n-- \n1.7.4.1.74.gf39475.dirty\n"},{"id":"161184","messageId":"01b5c355c401f327af34cf518955f87737d4a38a.1297775122.git.git@drmicha.warpmail.net","threadId":"26497","inReplyTo":"cover.1297695910.git.git@drmicha.warpmail.net","subject":"[PATCHv2 05/10] add: describe --patch like checkout, reset","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-15T13:09:08Z","receivedAt":"2011-02-15T13:09:08Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Signed-off-by: Michael J Gruber \n---\n builtin/add.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/builtin/add.c b/builtin/add.c\nindex 5f817ad..f8e51f9 100644\n--- a/builtin/add.c\n+++ b/builtin/add.c\n@@ -317,7 +317,7 @@ static struct option builtin_add_options[] = {\n \tOPT__VERBOSE(&verbose, \"be verbose\"),\n \tOPT_GROUP(\"\"),\n \tOPT_BOOLEAN('i', \"interactive\", &add_interactive, \"interactive picking\"),\n-\tOPT_BOOLEAN('p', \"patch\", &patch_interactive, \"interactive patching\"),\n+\tOPT_BOOLEAN('p', \"patch\", &patch_interactive, \"select hunks interactively\"),\n \tOPT_BOOLEAN('e', \"edit\", &edit_interactive, \"edit current diff and apply\"),\n \tOPT__FORCE(&ignored_too, \"allow adding otherwise ignored files\"),\n \tOPT_BOOLEAN('u', \"update\", &take_worktree_changes, \"update tracked files\"),\n-- \n1.7.4.1.74.gf39475.dirty\n"},{"id":"161185","messageId":"992cdae518224eb1f26eac7c4941b850fa203ec2.1297775122.git.git@drmicha.warpmail.net","threadId":"26497","inReplyTo":"cover.1297695910.git.git@drmicha.warpmail.net","subject":"[PATCHv2 06/10] commit,status: describe -u likewise","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-15T13:09:09Z","receivedAt":"2011-02-15T13:09:09Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"They differ by one character only. Being exactly equal should help\ntranslations.\n\nSigned-off-by: Michael J Gruber \n---\n builtin/commit.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 0090571..d7f55e3 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -150,7 +150,7 @@ static struct option builtin_commit_options[] = {\n \t\t \"terminate entries with NUL\"),\n \tOPT_BOOLEAN(0, \"amend\", &amend, \"amend previous commit\"),\n \tOPT_BOOLEAN(0, \"no-post-rewrite\", &no_post_rewrite, \"bypass post-rewrite hook\"),\n-\t{ OPTION_STRING, 'u', \"untracked-files\", &untracked_files_arg, \"mode\", \"show untracked files, optional modes: all, normal, no (Default: all)\", PARSE_OPT_OPTARG, NULL, (intptr_t)\"all\" },\n+\t{ OPTION_STRING, 'u', \"untracked-files\", &untracked_files_arg, \"mode\", \"show untracked files, optional modes: all, normal, no. (Default: all)\", PARSE_OPT_OPTARG, NULL, (intptr_t)\"all\" },\n \t/* end commit contents options */\n \n \t{ OPTION_BOOLEAN, 0, \"allow-empty\", &allow_empty, NULL,\n-- \n1.7.4.1.74.gf39475.dirty\n"},{"id":"161186","messageId":"d40d37a59ce17ff833edf07fd20f0faebde319a3.1297775122.git.git@drmicha.warpmail.net","threadId":"26497","inReplyTo":"cover.1297695910.git.git@drmicha.warpmail.net","subject":"[PATCHv2 07/10] git-tag.txt: list all modes in the description","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-15T13:09:10Z","receivedAt":"2011-02-15T13:09:10Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Currently, the description sounds as if it applied always, but most of\nits content is true in \"create tag mode\" only.\n\nMake this clearer by listing all modes upfront.\n\nAlso, sneak in some linguistic improvements and make it clearer that\nlightweight tags are \"created\" because \"written\" may be misread as\n\"are output\".\n\nSigned-off-by: Michael J Gruber \n---\n Documentation/git-tag.txt | 11 ++++++-----\n 1 files changed, 6 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt\nindex 8b169e3..65f76c5 100644\n--- a/Documentation/git-tag.txt\n+++ b/Documentation/git-tag.txt\n@@ -18,21 +18,22 @@ SYNOPSIS\n DESCRIPTION\n -----------\n \n-Adds a tag reference in `.git/refs/tags/`.\n+Add a tag reference in `.git/refs/tags/`, unless `-d/-l/-v` is given\n+to delete, list or verify tags.\n \n-Unless `-f` is given, the tag must not yet exist in\n+Unless `-f` is given, the tag to be created must not yet exist in the\n `.git/refs/tags/` directory.\n \n If one of `-a`, `-s`, or `-u ` is passed, the command\n-creates a 'tag' object, and requires the tag message. Unless\n+creates a 'tag' object, and requires a tag message. Unless\n `-m ` or `-F ` is given, an editor is started for the user to type\n in the tag message.\n \n If `-m ` or `-F ` is given and `-a`, `-s`, and `-u `\n are absent, `-a` is implied.\n \n-Otherwise just the SHA1 object name of the commit object is\n-written (i.e. a lightweight tag).\n+Otherwise just a tag reference for the SHA1 object name of the commit object is\n+created (i.e. a lightweight tag).\n \n A GnuPG signed tag object will be created when `-s` or `-u\n ` is used. When `-u ` is not used, the\n-- \n1.7.4.1.74.gf39475.dirty\n"},{"id":"161189","messageId":"c3d06219aaea4f0b08aeef8fa2ef360939476a8e.1297775122.git.git@drmicha.warpmail.net","threadId":"26497","inReplyTo":"cover.1297695910.git.git@drmicha.warpmail.net","subject":"[PATCHv2 08/10] Make lowercase as per CodingGuidelines","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-15T13:09:11Z","receivedAt":"2011-02-15T13:09:11Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"parse-options part\n\nSigned-off-by: Michael J Gruber \n---\n parse-options.h | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/parse-options.h b/parse-options.h\nindex 31ec5d2..d1b12fe 100644\n--- a/parse-options.h\n+++ b/parse-options.h\n@@ -141,7 +141,7 @@ struct option {\n \t{ OPTION_NUMBER, 0, NULL, (v), NULL, (h), \\\n \t PARSE_OPT_NOARG | PARSE_OPT_NONEG, (f) }\n #define OPT_FILENAME(s, l, v, h) { OPTION_FILENAME, (s), (l), (v), \\\n-\t\t\t\t \"FILE\", (h) }\n+\t\t\t\t \"file\", (h) }\n #define OPT_COLOR_FLAG(s, l, v, h) \\\n \t{ OPTION_CALLBACK, (s), (l), (v), \"when\", (h), PARSE_OPT_OPTARG, \\\n \t\tparse_opt_color_flag_cb, (intptr_t)\"always\" }\n-- \n1.7.4.1.74.gf39475.dirty\n"},{"id":"161188","messageId":"560074f9c7b62040e07a412146a947fff41a086e.1297775122.git.git@drmicha.warpmail.net","threadId":"26497","inReplyTo":"cover.1297695910.git.git@drmicha.warpmail.net","subject":"[PATCHv2 09/10] Make lowercase as per CodingGuidelines","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-15T13:09:12Z","receivedAt":"2011-02-15T13:09:12Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"*.c part for matches with '\"[A-Z]+\"'.\n\nSigned-off-by: Michael J Gruber \n---\n builtin/commit.c | 14 +++++++-------\n builtin/config.c | 2 +-\n builtin/fast-export.c | 4 ++--\n builtin/fetch.c | 6 +++---\n builtin/merge.c | 2 +-\n builtin/notes.c | 16 ++++++++--------\n builtin/read-tree.c | 4 ++--\n builtin/tag.c | 2 +-\n 8 files changed, 25 insertions(+), 25 deletions(-)\n\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex d7f55e3..355b2cb 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -119,13 +119,13 @@ static struct option builtin_commit_options[] = {\n \n \tOPT_GROUP(\"Commit message options\"),\n \tOPT_FILENAME('F', \"file\", &logfile, \"read message from file\"),\n-\tOPT_STRING(0, \"author\", &force_author, \"AUTHOR\", \"override author for commit\"),\n-\tOPT_STRING(0, \"date\", &force_date, \"DATE\", \"override date for commit\"),\n-\tOPT_CALLBACK('m', \"message\", &message, \"MESSAGE\", \"commit message\", opt_parse_m),\n-\tOPT_STRING('c', \"reedit-message\", &edit_message, \"COMMIT\", \"reuse and edit message from specified commit\"),\n-\tOPT_STRING('C', \"reuse-message\", &use_message, \"COMMIT\", \"reuse message from specified commit\"),\n-\tOPT_STRING(0, \"fixup\", &fixup_message, \"COMMIT\", \"use autosquash formatted message to fixup specified commit\"),\n-\tOPT_STRING(0, \"squash\", &squash_message, \"COMMIT\", \"use autosquash formatted message to squash specified commit\"),\n+\tOPT_STRING(0, \"author\", &force_author, \"author\", \"override author for commit\"),\n+\tOPT_STRING(0, \"date\", &force_date, \"date\", \"override date for commit\"),\n+\tOPT_CALLBACK('m', \"message\", &message, \"message\", \"commit message\", opt_parse_m),\n+\tOPT_STRING('c', \"reedit-message\", &edit_message, \"commit\", \"reuse and edit message from specified commit\"),\n+\tOPT_STRING('C', \"reuse-message\", &use_message, \"commit\", \"reuse message from specified commit\"),\n+\tOPT_STRING(0, \"fixup\", &fixup_message, \"commit\", \"use autosquash formatted message to fixup specified commit\"),\n+\tOPT_STRING(0, \"squash\", &squash_message, \"commit\", \"use autosquash formatted message to squash specified commit\"),\n \tOPT_BOOLEAN(0, \"reset-author\", &renew_authorship, \"the commit is authored by me now (used with -C-c/--amend)\"),\n \tOPT_BOOLEAN('s', \"signoff\", &signoff, \"add Signed-off-by:\"),\n \tOPT_FILENAME('t', \"template\", &template_file, \"use specified template file\"),\ndiff --git a/builtin/config.c b/builtin/config.c\nindex ca4a0db..b8b18e3 100644\n--- a/builtin/config.c\n+++ b/builtin/config.c\n@@ -52,7 +52,7 @@ static struct option builtin_config_options[] = {\n \tOPT_BOOLEAN(0, \"global\", &use_global_config, \"use global config file\"),\n \tOPT_BOOLEAN(0, \"system\", &use_system_config, \"use system config file\"),\n \tOPT_BOOLEAN(0, \"local\", &use_local_config, \"use repository config file\"),\n-\tOPT_STRING('f', \"file\", &given_config_file, \"FILE\", \"use given config file\"),\n+\tOPT_STRING('f', \"file\", &given_config_file, \"file\", \"use given config file\"),\n \tOPT_GROUP(\"Action\"),\n \tOPT_BIT(0, \"get\", &actions, \"get value: name [value-regex]\", ACTION_GET),\n \tOPT_BIT(0, \"get-all\", &actions, \"get all values: key [value-regex]\", ACTION_GET_ALL),\ndiff --git a/builtin/fast-export.c b/builtin/fast-export.c\nindex ba57457..daf1945 100644\n--- a/builtin/fast-export.c\n+++ b/builtin/fast-export.c\n@@ -619,9 +619,9 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)\n \t\tOPT_CALLBACK(0, \"tag-of-filtered-object\", &tag_of_filtered_mode, \"mode\",\n \t\t\t \"select handling of tags that tag filtered objects\",\n \t\t\t parse_opt_tag_of_filtered_mode),\n-\t\tOPT_STRING(0, \"export-marks\", &export_filename, \"FILE\",\n+\t\tOPT_STRING(0, \"export-marks\", &export_filename, \"file\",\n \t\t\t \"Dump marks to this file\"),\n-\t\tOPT_STRING(0, \"import-marks\", &import_filename, \"FILE\",\n+\t\tOPT_STRING(0, \"import-marks\", &import_filename, \"file\",\n \t\t\t \"Import marks from this file\"),\n \t\tOPT_BOOLEAN(0, \"fake-missing-tagger\", &fake_missing_tagger,\n \t\t\t \"Fake a tagger when tags lack one\"),\ndiff --git a/builtin/fetch.c b/builtin/fetch.c\nindex 357f3cd..7efecfe 100644\n--- a/builtin/fetch.c\n+++ b/builtin/fetch.c\n@@ -49,7 +49,7 @@ static struct option builtin_fetch_options[] = {\n \t\t \"fetch from all remotes\"),\n \tOPT_BOOLEAN('a', \"append\", &append,\n \t\t \"append to .git/FETCH_HEAD instead of overwriting\"),\n-\tOPT_STRING(0, \"upload-pack\", &upload_pack, \"PATH\",\n+\tOPT_STRING(0, \"upload-pack\", &upload_pack, \"path\",\n \t\t \"path to upload pack on remote end\"),\n \tOPT__FORCE(&force, \"force overwrite of local branch\"),\n \tOPT_BOOLEAN('m', \"multiple\", &multiple,\n@@ -69,9 +69,9 @@ static struct option builtin_fetch_options[] = {\n \tOPT_BOOLEAN('u', \"update-head-ok\", &update_head_ok,\n \t\t \"allow updating of HEAD ref\"),\n \tOPT_BOOLEAN(0, \"progress\", &progress, \"force progress reporting\"),\n-\tOPT_STRING(0, \"depth\", &depth, \"DEPTH\",\n+\tOPT_STRING(0, \"depth\", &depth, \"depth\",\n \t\t \"deepen history of shallow clone\"),\n-\t{ OPTION_STRING, 0, \"submodule-prefix\", &submodule_prefix, \"DIR\",\n+\t{ OPTION_STRING, 0, \"submodule-prefix\", &submodule_prefix, \"dir\",\n \t\t \"prepend this to submodule path output\", PARSE_OPT_HIDDEN },\n \tOPT_END()\n };\ndiff --git a/builtin/merge.c b/builtin/merge.c\nindex 8c58c3c..0710281 100644\n--- a/builtin/merge.c\n+++ b/builtin/merge.c\n@@ -194,7 +194,7 @@ static struct option builtin_merge_options[] = {\n \t\t\"merge strategy to use\", option_parse_strategy),\n \tOPT_CALLBACK('X', \"strategy-option\", &xopts, \"option=value\",\n \t\t\"option for selected merge strategy\", option_parse_x),\n-\tOPT_CALLBACK('m', \"message\", &merge_msg, \"MESSAGE\",\n+\tOPT_CALLBACK('m', \"message\", &merge_msg, \"message\",\n \t\t\"merge commit message (for a non-fast-forward merge)\",\n \t\toption_parse_message),\n \tOPT__VERBOSITY(&verbosity),\ndiff --git a/builtin/notes.c b/builtin/notes.c\nindex 4d5556e..0aab150 100644\n--- a/builtin/notes.c\n+++ b/builtin/notes.c\n@@ -537,16 +537,16 @@ static int add(int argc, const char **argv, const char *prefix)\n \tconst unsigned char *note;\n \tstruct msg_arg msg = { 0, 0, STRBUF_INIT };\n \tstruct option options[] = {\n-\t\t{ OPTION_CALLBACK, 'm', \"message\", &msg, \"MSG\",\n+\t\t{ OPTION_CALLBACK, 'm', \"message\", &msg, \"msg\",\n \t\t\t\"note contents as a string\", PARSE_OPT_NONEG,\n \t\t\tparse_msg_arg},\n-\t\t{ OPTION_CALLBACK, 'F', \"file\", &msg, \"FILE\",\n+\t\t{ OPTION_CALLBACK, 'F', \"file\", &msg, \"file\",\n \t\t\t\"note contents in a file\", PARSE_OPT_NONEG,\n \t\t\tparse_file_arg},\n-\t\t{ OPTION_CALLBACK, 'c', \"reedit-message\", &msg, \"OBJECT\",\n+\t\t{ OPTION_CALLBACK, 'c', \"reedit-message\", &msg, \"object\",\n \t\t\t\"reuse and edit specified note object\", PARSE_OPT_NONEG,\n \t\t\tparse_reedit_arg},\n-\t\t{ OPTION_CALLBACK, 'C', \"reuse-message\", &msg, \"OBJECT\",\n+\t\t{ OPTION_CALLBACK, 'C', \"reuse-message\", &msg, \"object\",\n \t\t\t\"reuse specified note object\", PARSE_OPT_NONEG,\n \t\t\tparse_reuse_arg},\n \t\tOPT__FORCE(&force, \"replace existing notes\"),\n@@ -682,16 +682,16 @@ static int append_edit(int argc, const char **argv, const char *prefix)\n \tconst char * const *usage;\n \tstruct msg_arg msg = { 0, 0, STRBUF_INIT };\n \tstruct option options[] = {\n-\t\t{ OPTION_CALLBACK, 'm', \"message\", &msg, \"MSG\",\n+\t\t{ OPTION_CALLBACK, 'm', \"message\", &msg, \"msg\",\n \t\t\t\"note contents as a string\", PARSE_OPT_NONEG,\n \t\t\tparse_msg_arg},\n-\t\t{ OPTION_CALLBACK, 'F', \"file\", &msg, \"FILE\",\n+\t\t{ OPTION_CALLBACK, 'F', \"file\", &msg, \"file\",\n \t\t\t\"note contents in a file\", PARSE_OPT_NONEG,\n \t\t\tparse_file_arg},\n-\t\t{ OPTION_CALLBACK, 'c', \"reedit-message\", &msg, \"OBJECT\",\n+\t\t{ OPTION_CALLBACK, 'c', \"reedit-message\", &msg, \"object\",\n \t\t\t\"reuse and edit specified note object\", PARSE_OPT_NONEG,\n \t\t\tparse_reedit_arg},\n-\t\t{ OPTION_CALLBACK, 'C', \"reuse-message\", &msg, \"OBJECT\",\n+\t\t{ OPTION_CALLBACK, 'C', \"reuse-message\", &msg, \"object\",\n \t\t\t\"reuse specified note object\", PARSE_OPT_NONEG,\n \t\t\tparse_reuse_arg},\n \t\tOPT_END()\ndiff --git a/builtin/read-tree.c b/builtin/read-tree.c\nindex 73c89ed..93c9281 100644\n--- a/builtin/read-tree.c\n+++ b/builtin/read-tree.c\n@@ -104,8 +104,8 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)\n \tstruct unpack_trees_options opts;\n \tint prefix_set = 0;\n \tconst struct option read_tree_options[] = {\n-\t\t{ OPTION_CALLBACK, 0, \"index-output\", NULL, \"FILE\",\n-\t\t \"write resulting index to \",\n+\t\t{ OPTION_CALLBACK, 0, \"index-output\", NULL, \"file\",\n+\t\t \"write resulting index to \",\n \t\t PARSE_OPT_NONEG, index_output_cb },\n \t\tOPT_SET_INT(0, \"empty\", &read_empty,\n \t\t\t \"only empty the index\", 1),\ndiff --git a/builtin/tag.c b/builtin/tag.c\nindex 246a2bc..7cf48ab 100644\n--- a/builtin/tag.c\n+++ b/builtin/tag.c\n@@ -376,7 +376,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)\n \t\tOPT_GROUP(\"Tag creation options\"),\n \t\tOPT_BOOLEAN('a', NULL, &annotate,\n \t\t\t\t\t\"annotated tag, needs a message\"),\n-\t\tOPT_CALLBACK('m', NULL, &msg, \"MESSAGE\",\n+\t\tOPT_CALLBACK('m', NULL, &msg, \"message\",\n \t\t\t \"tag message\", parse_msg_arg),\n \t\tOPT_FILENAME('F', NULL, &msgfile, \"read message from file\"),\n \t\tOPT_BOOLEAN('s', NULL, &sign, \"annotated and GPG-signed tag\"),\n-- \n1.7.4.1.74.gf39475.dirty\n"},{"id":"161187","messageId":"225b45c4590c105d69aa9e1c65aa5e89c2528556.1297775122.git.git@drmicha.warpmail.net","threadId":"26497","inReplyTo":"cover.1297695910.git.git@drmicha.warpmail.net","subject":"[PATCHv2 10/10] Make lowercase as per CodingGuidelines","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-15T13:09:13Z","receivedAt":"2011-02-15T13:09:13Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"*.c part for matches with '<[A-Z]+>' (and affected test).\n\nSigned-off-by: Michael J Gruber \n---\n t/t0040-parse-options.sh | 2 +-\n test-parse-options.c | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh\nindex 2092450..ae26614 100755\n--- a/t/t0040-parse-options.sh\n+++ b/t/t0040-parse-options.sh\n@@ -19,7 +19,7 @@ usage: test-parse-options \n --set23 set integer to 23\n -t