{"thread":{"id":"39876","subject":"[PATCH] branch: fix usage string for specific git-branch options","startedAt":"2015-07-17T18:17:00Z","lastAt":"2015-07-17T19:16:19Z","messageCount":2,"participants":["Ralf Thielow","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"266259","messageId":"1437157020-16672-1-git-send-email-ralf.thielow@gmail.com","threadId":"39876","inReplyTo":null,"subject":"[PATCH] branch: fix usage string for specific git-branch options","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2015-07-17T18:17:00Z","receivedAt":"2015-07-17T18:17:00Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"The usage string of git-branch shows generic options and specific\noptions. However, the specific options are called \"actions\".\nCall them both options.\n\nSigned-off-by: Ralf Thielow <ralf.thielow@gmail.com>\n---\n builtin/branch.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/branch.c b/builtin/branch.c\nindex 1d15037..709dfc4 100644\n--- a/builtin/branch.c\n+++ b/builtin/branch.c\n@@ -844,7 +844,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)\n \t\t},\n \t\tOPT__ABBREV(&abbrev),\n \n-\t\tOPT_GROUP(N_(\"Specific git-branch actions:\")),\n+\t\tOPT_GROUP(N_(\"Specific git-branch options:\")),\n \t\tOPT_SET_INT('a', \"all\", &kinds, N_(\"list both remote-tracking and local branches\"),\n \t\t\tREF_REMOTE_BRANCH | REF_LOCAL_BRANCH),\n \t\tOPT_BIT('d', \"delete\", &delete, N_(\"delete fully merged branch\"), 1),\n-- \n2.5.0.rc2.379.ga7d8b34\n"},{"id":"266261","messageId":"xmqqsi8m1toc.fsf@gitster.dls.corp.google.com","threadId":"39876","inReplyTo":"1437157020-16672-1-git-send-email-ralf.thielow@gmail.com","subject":"Re: [PATCH] branch: fix usage string for specific git-branch options","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-07-17T19:16:19Z","receivedAt":"2015-07-17T19:16:19Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ralf Thielow <ralf.thielow@gmail.com> writes:\n\n> The usage string of git-branch shows generic options and specific\n> options. However, the specific options are called \"actions\".\n> Call them both options.\n\nI think this is a valid problem to address, but I do not know if the\nproposed solution is the right one.\n\nOriginally, the word \"action\" there really meant to mean \"action\".\n\"git branch\" can \"list\" existing ones, \"create\" new ones, \"delete\"\nexisting ones, \"edit\" upstream info or description for, etc.  These\nare distinct actions.\n\nFor a single \"action\", there are various ways to perform it.\nDifferent ways to affect \"list\", for example, are like \"choosing\nwhich ones are listed\", \"deciding if the output is colored\", etc..\nThe \"options\" section was meant to cover these modifiers.\n\nI think the real issues may be coming from one or both of the two:\n\n (1) some are grossly miscategorized.  \"--all\" is not an action.  It\n     just affects how \"listing\" works.  \"--no-merged\" and \"--merged\"\n     are the same way and should sit next to \"--contains\".\n\n     \"--set-upstream\" and \"--unset-upstream\" on the other hand are\n     not modifiers for some other actions, but are their own actions.\n\n (2) \"Generic options\" would need to show things like \"-v/-q/-f\"\n     that would want to consistently apply to any action that you\n     might want to invoke.  Because not all modifiers apply to all\n     actions, there is no good place to put things like \"-t\" (that\n     has no meaning when you are invoking \"delete\" action) that are\n     specific to only a subset of available actions, i.e. \"Not\n     generic\" ones.\n\nSo the real way forward would be probably to do three things.\n\n * Keep the same two categorization as we have, i.e. \"generic\n   options\" and \"specific actions\";\n\n * Move the miscategorized non-actions to \"generic options\" section;\n\n * Move action-specific modifiers out of \"generic options\" and\n   clearly state what action they work with to modify the behaviour\n   of the action.\n"}]}