{"thread":{"id":"20452","subject":"[PATCH] Change mentions of \"git programs\" to \"git commands\"","startedAt":"2009-08-07T14:24:21Z","lastAt":"2009-08-13T12:02:28Z","messageCount":11,"participants":["Ori Avtalion","Junio C Hamano","Erik Faye-Lund","Nanako Shiraishi"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"119907","messageId":"4a7c3971.170d660a.3caa.20b3@mx.google.com","threadId":"20452","inReplyTo":null,"subject":"[PATCH] Change mentions of \"git programs\" to \"git commands\"","fromName":"Ori Avtalion","fromEmail":"ori@avtalion.name","sentAt":"2009-08-07T14:24:21Z","receivedAt":"2009-08-07T14:24:21Z","isPatch":true,"sender":{"key":"ori@avtalion.name","avatar":"https://avatars.githubusercontent.com/u/28355?v=4"},"body":"Most of the docs and printouts refer to \"commands\".\nThis patch changes the other terminology to be consistent.\n\nSigned-off-by: Ori Avtalion <ori@avtalion.name>\n---\n Documentation/config.txt           |    4 ++--\n Documentation/fetch-options.txt    |    2 +-\n Documentation/git-rev-list.txt     |    2 +-\n Documentation/git.txt              |    4 ++--\n Documentation/gitattributes.txt    |    2 +-\n Documentation/gitcore-tutorial.txt |    4 ++--\n Documentation/user-manual.txt      |    2 +-\n help.c                             |    2 +-\n 8 files changed, 11 insertions(+), 11 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex c6f09f8..e94a8ab 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -605,7 +605,7 @@ color.interactive.<slot>::\n \tUse customized color for 'git-add --interactive'\n \toutput. `<slot>` may be `prompt`, `header`, `help` or `error`, for\n \tfour distinct types of normal output from interactive\n-\tprograms.  The values of these variables may be specified as\n+\tcommands.  The values of these variables may be specified as\n \tin color.branch.<slot>.\n \n color.pager::\n@@ -1113,7 +1113,7 @@ instaweb.port::\n \tlinkgit:git-instaweb[1].\n \n interactive.singlekey::\n-\tIn interactive programs, allow the user to provide one-letter\n+\tIn interactive commands, allow the user to provide one-letter\n \tinput with a single key (i.e., without hitting enter).\n \tCurrently this is used only by the `\\--patch` mode of\n \tlinkgit:git-add[1].  Note that this setting is silently\ndiff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt\nindex d313795..20bf512 100644\n--- a/Documentation/fetch-options.txt\n+++ b/Documentation/fetch-options.txt\n@@ -1,7 +1,7 @@\n -q::\n --quiet::\n \tPass --quiet to git-fetch-pack and silence any other internally\n-\tused programs.\n+\tused utilities.\n \n -v::\n --verbose::\ndiff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt\nindex bf98c84..21ccccd 100644\n--- a/Documentation/git-rev-list.txt\n+++ b/Documentation/git-rev-list.txt\n@@ -90,7 +90,7 @@ between the two operands.  The following two commands are equivalent:\n \t$ git rev-list A...B\n -----------------------------------------------------------------------\n \n-'git-rev-list' is a very essential git program, since it\n+'git-rev-list' is a very essential git command, since it\n provides the ability to build and traverse commit ancestry graphs. For\n this reason, it has a lot of different options that enables it to be\n used by commands as different as 'git-bisect' and\ndiff --git a/Documentation/git.txt b/Documentation/git.txt\nindex 5fd5953..fe13e09 100644\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -189,7 +189,7 @@ because `git --help ...` is converted internally into `git\n help ...`.\n \n --exec-path::\n-\tPath to wherever your core git programs are installed.\n+\tPath to wherever your core git commands are installed.\n \tThis can also be controlled by setting the GIT_EXEC_PATH\n \tenvironment variable. If no path is given, 'git' will print\n \tthe current setting and then exit.\n@@ -327,7 +327,7 @@ Synching repositories\n \n include::cmds-synchingrepositories.txt[]\n \n-The following are helper programs used by the above; end users\n+The following are helper commands used by the above; end users\n typically do not use them directly.\n \n include::cmds-synchelpers.txt[]\ndiff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\nindex aaa073e..1195e83 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -404,7 +404,7 @@ Performing a three-way merge\n \n The attribute `merge` affects how three versions of a file is\n merged when a file-level merge is necessary during `git merge`,\n-and other programs such as `git revert` and `git cherry-pick`.\n+and other commands such as `git revert` and `git cherry-pick`.\n \n Set::\n \ndiff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt\nindex 7ba5e58..b3640c4 100644\n--- a/Documentation/gitcore-tutorial.txt\n+++ b/Documentation/gitcore-tutorial.txt\n@@ -12,7 +12,7 @@ git *\n DESCRIPTION\n -----------\n \n-This tutorial explains how to use the \"core\" git programs to set up and\n+This tutorial explains how to use the \"core\" git commands to set up and\n work with a git repository.\n \n If you just need to use git as a revision control system you may prefer\n@@ -1328,7 +1328,7 @@ into it later. Obviously, this repository creation needs to be\n done only once.\n \n [NOTE]\n-'git-push' uses a pair of programs,\n+'git-push' uses a pair of commands,\n 'git-send-pack' on your local machine, and 'git-receive-pack'\n on the remote machine. The communication between the two over\n the network internally uses an SSH connection.\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 0b88a51..67ebffa 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -4131,7 +4131,7 @@ What does this mean?\n \n `git rev-list` is the original version of the revision walker, which\n _always_ printed a list of revisions to stdout.  It is still functional,\n-and needs to, since most new Git programs start out as scripts using\n+and needs to, since most new Git commands start out as scripts using\n `git rev-list`.\n \n `git rev-parse` is not as important any more; it was only used to filter out\ndiff --git a/help.c b/help.c\nindex 6c46d8b..57a0e0e 100644\n--- a/help.c\n+++ b/help.c\n@@ -334,7 +334,7 @@ const char *help_unknown_cmd(const char *cmd)\n \t\tconst char *assumed = main_cmds.names[0]->name;\n \t\tmain_cmds.names[0] = NULL;\n \t\tclean_cmdnames(&main_cmds);\n-\t\tfprintf(stderr, \"WARNING: You called a Git program named '%s', \"\n+\t\tfprintf(stderr, \"WARNING: You called a Git command named '%s', \"\n \t\t\t\"which does not exist.\\n\"\n \t\t\t\"Continuing under the assumption that you meant '%s'\\n\",\n \t\t\tcmd, assumed);\n-- \n1.6.0.4\n"},{"id":"119916","messageId":"7v4osj1odt.fsf@alter.siamese.dyndns.org","threadId":"20452","inReplyTo":"4a7c3971.170d660a.3caa.20b3@mx.google.com","subject":"Re: [PATCH] Change mentions of \"git programs\" to \"git commands\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-08-07T18:15:42Z","receivedAt":"2009-08-07T18:15:42Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ori Avtalion <ori@avtalion.name> writes:\n\n> Most of the docs and printouts refer to \"commands\".\n> This patch changes the other terminology to be consistent.\n\nThanks, but not really.\n\n> @@ -605,7 +605,7 @@ color.interactive.<slot>::\n>  \tUse customized color for 'git-add --interactive'\n>  \toutput. `<slot>` may be `prompt`, `header`, `help` or `error`, for\n>  \tfour distinct types of normal output from interactive\n> -\tprograms.  The values of these variables may be specified as\n> +\tcommands.  The values of these variables may be specified as\n\nThis is good.\n\n>  color.pager::\n> @@ -1113,7 +1113,7 @@ instaweb.port::\n>  \tlinkgit:git-instaweb[1].\n>  \n>  interactive.singlekey::\n> -\tIn interactive programs, allow the user to provide one-letter\n> +\tIn interactive commands, allow the user to provide one-letter\n\nThis is good.\n\n> diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt\n> index d313795..20bf512 100644\n> --- a/Documentation/fetch-options.txt\n> +++ b/Documentation/fetch-options.txt\n> @@ -1,7 +1,7 @@\n>  -q::\n>  --quiet::\n>  \tPass --quiet to git-fetch-pack and silence any other internally\n> -\tused programs.\n> +\tused utilities.\n\nThis does not have much to do with what you claim to have done in the\ncommit log message nor the title.  Probably \"utilities\" is a slightly\nbetter word than \"programs\" in this context but not by a wide margin.\n\n> -'git-rev-list' is a very essential git program, since it\n> +'git-rev-list' is a very essential git command, since it\n>  provides the ability to build and traverse commit ancestry graphs. For\n>  this reason, it has a lot of different options that enables it to be\n>  used by commands as different as 'git-bisect' and\n\nOk, but probably we would want to say \"git rev-list\" here.\n\n>  --exec-path::\n> -\tPath to wherever your core git programs are installed.\n> +\tPath to wherever your core git commands are installed.\n\nI do not think this is a good change.\n\nWhen you talk about git \"command\", e.g. \"'git rev-list' is an essential\ncommand\", you are talking about an abstract concept.  In the reader's\nworld view, there is one single toplevel program called \"git\" and it has\nvarious commands, one of which is 'rev-list'.  But this description is not\nabout an abstract concept of command, but is about a particular\nimplementation detail.  For every git command, there is a corresponding\ngit _program_ that implements that command, and --exec-path tells you (or\nyou use --exec-path to tell the git toplevel program) where they are.\n\nYou kept this intact in gitcore-tutorial:\n\n    ... Also\n    you need to make sure that you have the 'git-receive-pack'\n    program on the `$PATH`.\n\nand I think you did the right thing.  This is about a concrete instance of\na program.  If you really really want to say _command_, you would probably\nwant to do something like this instead:\n\n --exec-path::\n-\tPath to wherever your core git programs are installed.\n+\tPath to the directory that holds programs that implements git commands.\n\n> @@ -327,7 +327,7 @@ Synching repositories\n>  \n>  include::cmds-synchingrepositories.txt[]\n>  \n> -The following are helper programs used by the above; end users\n> +The following are helper commands used by the above; end users\n>  typically do not use them directly.\n\nOk.\n\n>  The attribute `merge` affects how three versions of a file is\n>  merged when a file-level merge is necessary during `git merge`,\n> -and other programs such as `git revert` and `git cherry-pick`.\n> +and other commands such as `git revert` and `git cherry-pick`.\n\nOk.\n\n> diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt\n> index 7ba5e58..b3640c4 100644\n> --- a/Documentation/gitcore-tutorial.txt\n> +++ b/Documentation/gitcore-tutorial.txt\n> @@ -12,7 +12,7 @@ git *\n>  DESCRIPTION\n>  -----------\n>  \n> -This tutorial explains how to use the \"core\" git programs to set up and\n> +This tutorial explains how to use the \"core\" git commands to set up and\n>  work with a git repository.\n>  \n>  If you just need to use git as a revision control system you may prefer\n\nOk.\n\n> @@ -1328,7 +1328,7 @@ into it later. Obviously, this repository creation needs to be\n>  done only once.\n>  \n>  [NOTE]\n> -'git-push' uses a pair of programs,\n> +'git-push' uses a pair of commands,\n>  'git-send-pack' on your local machine, and 'git-receive-pack'\n>  on the remote machine. The communication between the two over\n>  the network internally uses an SSH connection.\n\nOk.\n\n> diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\n> index 0b88a51..67ebffa 100644\n> --- a/Documentation/user-manual.txt\n> +++ b/Documentation/user-manual.txt\n> @@ -4131,7 +4131,7 @@ What does this mean?\n>  \n>  `git rev-list` is the original version of the revision walker, which\n>  _always_ printed a list of revisions to stdout.  It is still functional,\n> -and needs to, since most new Git programs start out as scripts using\n> +and needs to, since most new Git commands start out as scripts using\n>  `git rev-list`.\n\nOk.\n\n>  `git rev-parse` is not as important any more; it was only used to filter out\n> diff --git a/help.c b/help.c\n> index 6c46d8b..57a0e0e 100644\n> --- a/help.c\n> +++ b/help.c\n> @@ -334,7 +334,7 @@ const char *help_unknown_cmd(const char *cmd)\n>  \t\tconst char *assumed = main_cmds.names[0]->name;\n>  \t\tmain_cmds.names[0] = NULL;\n>  \t\tclean_cmdnames(&main_cmds);\n> -\t\tfprintf(stderr, \"WARNING: You called a Git program named '%s', \"\n> +\t\tfprintf(stderr, \"WARNING: You called a Git command named '%s', \"\n>  \t\t\t\"which does not exist.\\n\"\n>  \t\t\t\"Continuing under the assumption that you meant '%s'\\n\",\n>  \t\t\tcmd, assumed);\n\nOk.\n"},{"id":"119983","messageId":"40aa078e0908080512q43b3c772r3fe7a361102a73f4@mail.gmail.com","threadId":"20452","inReplyTo":"7v4osj1odt.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Change mentions of \"git programs\" to \"git commands\"","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@googlemail.com","sentAt":"2009-08-08T12:12:48Z","receivedAt":"2009-08-08T12:12:48Z","isPatch":true,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"On Fri, Aug 7, 2009 at 8:15 PM, Junio C Hamano<gitster@pobox.com> wrote:\n>> -'git-rev-list' is a very essential git program, since it\n>> +'git-rev-list' is a very essential git command, since it\n>>  provides the ability to build and traverse commit ancestry graphs. For\n>>  this reason, it has a lot of different options that enables it to be\n>>  used by commands as different as 'git-bisect' and\n>\n> Ok, but probably we would want to say \"git rev-list\" here.\n\n...or maybe just \"rev-list\", as we're now talking about a git-command\n(and not how you invoke it)?\n\n\n-- \nErik \"kusma\" Faye-Lund\nkusmabite@gmail.com\n(+47) 986 59 656\n"},{"id":"119986","messageId":"4A7D7CF2.40902@avtalion.name","threadId":"20452","inReplyTo":"7v4osj1odt.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Change mentions of \"git programs\" to \"git commands\"","fromName":"Ori Avtalion","fromEmail":"ori@avtalion.name","sentAt":"2009-08-08T13:26:10Z","receivedAt":"2009-08-08T13:26:10Z","isPatch":true,"sender":{"key":"ori@avtalion.name","avatar":"https://avatars.githubusercontent.com/u/28355?v=4"},"body":"On 08/07/2009 09:15 PM, Junio C Hamano wrote:\n> Ori Avtalion<ori@avtalion.name>  writes:\n>\n>> Most of the docs and printouts refer to \"commands\".\n>> This patch changes the other terminology to be consistent.\n>\n> Thanks, but not really.\n>\n>> diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt\n>> index d313795..20bf512 100644\n>> --- a/Documentation/fetch-options.txt\n>> +++ b/Documentation/fetch-options.txt\n>> @@ -1,7 +1,7 @@\n>>   -q::\n>>   --quiet::\n>>   \tPass --quiet to git-fetch-pack and silence any other internally\n>> -\tused programs.\n>> +\tused utilities.\n>\n> This does not have much to do with what you claim to have done in the\n> commit log message nor the title.  Probably \"utilities\" is a slightly\n> better word than \"programs\" in this context but not by a wide margin.\n>\n\nI picked the word from the glossary definition of \"core git\":\n\n   \"Fundamental data structures and utilities of git. [...]\"\n\nIf that doesn't fit, how about:\n    \"Pass --quiet to git-fetch-pack and silence other output\" ?\n\n>> -'git-rev-list' is a very essential git program, since it\n>> +'git-rev-list' is a very essential git command, since it\n>>   provides the ability to build and traverse commit ancestry graphs. For\n>>   this reason, it has a lot of different options that enables it to be\n>>   used by commands as different as 'git-bisect' and\n>\n> Ok, but probably we would want to say \"git rev-list\" here.\n\nIn that case, shouldn't all of the manpages be changed to say \"git foo\" \ninstead of \"git-foo\" under the NAME section?\n\nI see the \"git-foo\" notation as a convention for git commands.\nIt may be for historical reasons, but the manpage for the \"pull\" git \ncommand is \"git-pull\", and that is how commands are mentioned all over \nthe documentation.\n\n>\n>>   --exec-path::\n>> -\tPath to wherever your core git programs are installed.\n>> +\tPath to wherever your core git commands are installed.\n>\n> I do not think this is a good change.\n>\n> When you talk about git \"command\", e.g. \"'git rev-list' is an essential\n> command\", you are talking about an abstract concept.  In the reader's\n> world view, there is one single toplevel program called \"git\" and it has\n> various commands, one of which is 'rev-list'.  But this description is not\n> about an abstract concept of command, but is about a particular\n> implementation detail.  For every git command, there is a corresponding\n> git _program_ that implements that command, and --exec-path tells you (or\n> you use --exec-path to tell the git toplevel program) where they are.\n>\n> You kept this intact in gitcore-tutorial:\n>\n>      ... Also\n>      you need to make sure that you have the 'git-receive-pack'\n>      program on the `$PATH`.\n>\n> and I think you did the right thing.  This is about a concrete instance of\n> a program.  If you really really want to say _command_, you would probably\n> want to do something like this instead:\n>\n>   --exec-path::\n> -\tPath to wherever your core git programs are installed.\n> +\tPath to the directory that holds programs that implements git commands.\n>\n\nI agree with the suggestion.\n\n\nI found a few other instances that should probably be changed.\n\nIn git.txt:\n\"The following are helper programs used by the above\"\n                           ^^^^^^^^\n                           commands\n\nIn git-mailsplit.txt (and cmds-purehelpers.txt):\n    \"Simple UNIX mbox splitter program.\"\n\nMaybe the word \"program\" should just be dropped.\n\n\nI'll submit a new patch once there's an agreement on the changes.\n\n-Ori\n"},{"id":"119992","messageId":"7v8whul1x5.fsf@alter.siamese.dyndns.org","threadId":"20452","inReplyTo":"4A7D7CF2.40902@avtalion.name","subject":"Re: [PATCH] Change mentions of \"git programs\" to \"git commands\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-08-08T16:12:54Z","receivedAt":"2009-08-08T16:12:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ori Avtalion <ori@avtalion.name> writes:\n\n> On 08/07/2009 09:15 PM, Junio C Hamano wrote:\n>> Ori Avtalion<ori@avtalion.name>  writes:\n>>\n>>> Most of the docs and printouts refer to \"commands\".\n>>> This patch changes the other terminology to be consistent.\n>>\n>> Thanks, but not really.\n>>\n>>> diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt\n>>> index d313795..20bf512 100644\n>>> --- a/Documentation/fetch-options.txt\n>>> +++ b/Documentation/fetch-options.txt\n>>> @@ -1,7 +1,7 @@\n>>>   -q::\n>>>   --quiet::\n>>>   \tPass --quiet to git-fetch-pack and silence any other internally\n>>> -\tused programs.\n>>> +\tused utilities.\n>>\n>> This does not have much to do with what you claim to have done in the\n>> commit log message nor the title.  Probably \"utilities\" is a slightly\n>> better word than \"programs\" in this context but not by a wide margin.\n>\n> If that doesn't fit,...\n\nMy comment on this part was not \"Don't change this wording, the original\nis much better\", but was primarily \"you said this commit is about\nreplacing 'program' with 'command' for consistency, but this change does\nnot belong to that category.  Either make a separate commit for this\nchange separate from all the rest, or change the wording of the commit log\nmessage to cover this one as well\".\n\n>    \"Pass --quiet to git-fetch-pack and silence other output\" ?\n>\n>>> -'git-rev-list' is a very essential git program, since it\n>>> +'git-rev-list' is a very essential git command, since it\n>>>   provides the ability to build and traverse commit ancestry graphs. For\n>>>   this reason, it has a lot of different options that enables it to be\n>>>   used by commands as different as 'git-bisect' and\n>>\n>> Ok, but probably we would want to say \"git rev-list\" here.\n> ...\n> I see the \"git-foo\" notation as a convention for git commands.\n> It may be for historical reasons, but the manpage for the \"pull\" git\n> command is \"git-pull\", and that is how commands are mentioned all over\n> the documentation.\n\nThis was \"because you are changing the exact sentence anyway, why not do\nthis while you are at it\".  But you are probably right.  We try to write\n\"git foo\" when we talk about what users would type, but say \"git-foo\" when\nwe talk about the command itself.  When we talk about the concept of what\nthe command achieves, we sometimes say just \"foo\".\n\n> In git.txt:\n> \"The following are helper programs used by the above\"\n>                           ^^^^^^^^\n>                           commands\n>\n> In git-mailsplit.txt (and cmds-purehelpers.txt):\n>    \"Simple UNIX mbox splitter program.\"\n>\n> Maybe the word \"program\" should just be dropped.\n\nThat may be an option and I kind of like it; but I'd rather hear from\nothers first.\n"},{"id":"120253","messageId":"20090811125813.6117@nanako3.lavabit.com","threadId":"20452","inReplyTo":"4a7c3971.170d660a.3caa.20b3@mx.google.com","subject":"[PATCH] Change mentions of \"git programs\" to \"git commands\"","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2009-08-11T03:58:13Z","receivedAt":"2009-08-11T03:58:13Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"From: Ori Avtalion <ori@avtalion.name>\nDate: Fri, 7 Aug 2009 17:24:21 +0300\nSubject: [PATCH] Change mentions of \"git programs\" to \"git commands\"\n\nMost of the docs and printouts refer to \"commands\" when discussing what\nthe end users call via the \"git\" top-level program. We should refer them\nas \"git programs\" when we discuss the fact that the commands are\nimplemented as separate programs, but in other contexts, it is better to\nuse the term \"git commands\" consistently.\n\nSigned-off-by: Ori Avtalion <ori@avtalion.name>\nSigned-off-by: Nanako Shiraishi <nanako3@lavabit.com>\n---\n\n Junio, it appeard to me that you had some minor issues with Ori's patch but you knew exactly how they should be addressed and you thought it was a good change overall.\n\n I copy-edited Ori's patch for your convenience, and tried to clarify the criteria you used to decide which \"program\" should become \"command\" in the updated commit log message, in case you forgot to apply it yourself.\n\n I just didn't want to see the time you and others spent on submitting and reviewing wasted due to lack of resubmission of a revised patch.\n\n Documentation/config.txt           |    4 ++--\n Documentation/fetch-options.txt    |    2 +-\n Documentation/git-rev-list.txt     |    2 +-\n Documentation/git.txt              |    4 ++--\n Documentation/gitattributes.txt    |    2 +-\n Documentation/gitcore-tutorial.txt |    4 ++--\n Documentation/user-manual.txt      |    2 +-\n help.c                             |    2 +-\n 8 files changed, 11 insertions(+), 11 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex c6f09f8..e94a8ab 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -605,7 +605,7 @@ color.interactive.<slot>::\n \tUse customized color for 'git-add --interactive'\n \toutput. `<slot>` may be `prompt`, `header`, `help` or `error`, for\n \tfour distinct types of normal output from interactive\n-\tprograms.  The values of these variables may be specified as\n+\tcommands.  The values of these variables may be specified as\n \tin color.branch.<slot>.\n \n color.pager::\n@@ -1113,7 +1113,7 @@ instaweb.port::\n \tlinkgit:git-instaweb[1].\n \n interactive.singlekey::\n-\tIn interactive programs, allow the user to provide one-letter\n+\tIn interactive commands, allow the user to provide one-letter\n \tinput with a single key (i.e., without hitting enter).\n \tCurrently this is used only by the `\\--patch` mode of\n \tlinkgit:git-add[1].  Note that this setting is silently\ndiff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt\nindex d313795..20bf512 100644\n--- a/Documentation/fetch-options.txt\n+++ b/Documentation/fetch-options.txt\n@@ -1,7 +1,7 @@\n -q::\n --quiet::\n \tPass --quiet to git-fetch-pack and silence any other internally\n-\tused programs.\n+\tused git commands.\n \n -v::\n --verbose::\ndiff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt\nindex bf98c84..21ccccd 100644\n--- a/Documentation/git-rev-list.txt\n+++ b/Documentation/git-rev-list.txt\n@@ -90,7 +90,7 @@ between the two operands.  The following two commands are equivalent:\n \t$ git rev-list A...B\n -----------------------------------------------------------------------\n \n-'git-rev-list' is a very essential git program, since it\n+'rev-list' is a very essential git command, since it\n provides the ability to build and traverse commit ancestry graphs. For\n this reason, it has a lot of different options that enables it to be\n used by commands as different as 'git-bisect' and\ndiff --git a/Documentation/git.txt b/Documentation/git.txt\nindex 5fd5953..fe13e09 100644\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -327,7 +327,7 @@ Synching repositories\n \n include::cmds-synchingrepositories.txt[]\n \n-The following are helper programs used by the above; end users\n+The following are helper commands used by the above; end users\n typically do not use them directly.\n \n include::cmds-synchelpers.txt[]\ndiff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\nindex aaa073e..1195e83 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -404,7 +404,7 @@ Performing a three-way merge\n \n The attribute `merge` affects how three versions of a file is\n merged when a file-level merge is necessary during `git merge`,\n-and other programs such as `git revert` and `git cherry-pick`.\n+and other commands such as `git revert` and `git cherry-pick`.\n \n Set::\n \ndiff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt\nindex 7ba5e58..b3640c4 100644\n--- a/Documentation/gitcore-tutorial.txt\n+++ b/Documentation/gitcore-tutorial.txt\n@@ -12,7 +12,7 @@ git *\n DESCRIPTION\n -----------\n \n-This tutorial explains how to use the \"core\" git programs to set up and\n+This tutorial explains how to use the \"core\" git commands to set up and\n work with a git repository.\n \n If you just need to use git as a revision control system you may prefer\n@@ -1328,7 +1328,7 @@ into it later. Obviously, this repository creation needs to be\n done only once.\n \n [NOTE]\n-'git-push' uses a pair of programs,\n+'git-push' uses a pair of commands,\n 'git-send-pack' on your local machine, and 'git-receive-pack'\n on the remote machine. The communication between the two over\n the network internally uses an SSH connection.\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 0b88a51..67ebffa 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -4131,7 +4131,7 @@ What does this mean?\n \n `git rev-list` is the original version of the revision walker, which\n _always_ printed a list of revisions to stdout.  It is still functional,\n-and needs to, since most new Git programs start out as scripts using\n+and needs to, since most new Git commands start out as scripts using\n `git rev-list`.\n \n `git rev-parse` is not as important any more; it was only used to filter out\ndiff --git a/help.c b/help.c\nindex 6c46d8b..57a0e0e 100644\n--- a/help.c\n+++ b/help.c\n@@ -334,7 +334,7 @@ const char *help_unknown_cmd(const char *cmd)\n \t\tconst char *assumed = main_cmds.names[0]->name;\n \t\tmain_cmds.names[0] = NULL;\n \t\tclean_cmdnames(&main_cmds);\n-\t\tfprintf(stderr, \"WARNING: You called a Git program named '%s', \"\n+\t\tfprintf(stderr, \"WARNING: You called a Git command named '%s', \"\n \t\t\t\"which does not exist.\\n\"\n \t\t\t\"Continuing under the assumption that you meant '%s'\\n\",\n \t\t\tcmd, assumed);\n-- \n1.6.2.GIT\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"},{"id":"120227","messageId":"4A815AAC.2030601@avtalion.name","threadId":"20452","inReplyTo":"20090811125813.6117@nanako3.lavabit.com","subject":"Re: [PATCH] Change mentions of \"git programs\" to \"git commands\"","fromName":"Ori Avtalion","fromEmail":"ori@avtalion.name","sentAt":"2009-08-11T11:49:00Z","receivedAt":"2009-08-11T11:49:00Z","isPatch":true,"sender":{"key":"ori@avtalion.name","avatar":"https://avatars.githubusercontent.com/u/28355?v=4"},"body":"On 08/11/2009 06:58 AM, Nanako Shiraishi wrote:\n> From: Ori Avtalion<ori@avtalion.name>\n> Date: Fri, 7 Aug 2009 17:24:21 +0300\n> Subject: [PATCH] Change mentions of \"git programs\" to \"git commands\"\n>\n> Most of the docs and printouts refer to \"commands\" when discussing what\n> the end users call via the \"git\" top-level program. We should refer them\n> as \"git programs\" when we discuss the fact that the commands are\n> implemented as separate programs, but in other contexts, it is better to\n> use the term \"git commands\" consistently.\n>\n> Signed-off-by: Ori Avtalion<ori@avtalion.name>\n> Signed-off-by: Nanako Shiraishi<nanako3@lavabit.com>\n> ---\n>\n\nThanks Nanako!\n\nI'm fine with the changes.\n(it doesn't help much to nitpick on 'git-foo' vs 'git foo' vs 'foo' :)\n\nYou might want to consider this patch too:\n\ndiff --git a/Documentation/git-mailsplit.txt \nb/Documentation/git-mailsplit.txt\nindex 5cc94ec..8f1b99b 100644\n--- a/Documentation/git-mailsplit.txt\n+++ b/Documentation/git-mailsplit.txt\n@@ -3,7 +3,7 @@ git-mailsplit(1)\n\n  NAME\n  ----\n-git-mailsplit - Simple UNIX mbox splitter program\n+git-mailsplit - Simple UNIX mbox splitter\n\n  SYNOPSIS\n  --------\n"},{"id":"120321","messageId":"20090812075946.6117@nanako3.lavabit.com","threadId":"20452","inReplyTo":"4A815AAC.2030601@avtalion.name","subject":"Re: [PATCH] Change mentions of \"git programs\" to \"git commands\"","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2009-08-11T22:59:46Z","receivedAt":"2009-08-11T22:59:46Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Quoting Ori Avtalion <ori@avtalion.name>\n\n> On 08/11/2009 06:58 AM, Nanako Shiraishi wrote:\n>> From: Ori Avtalion<ori@avtalion.name>\n>> Date: Fri, 7 Aug 2009 17:24:21 +0300\n>> Subject: [PATCH] Change mentions of \"git programs\" to \"git commands\"\n>>\n>> Most of the docs and printouts refer to \"commands\" when discussing what\n>> the end users call via the \"git\" top-level program. We should refer them\n>> as \"git programs\" when we discuss the fact that the commands are\n>> implemented as separate programs, but in other contexts, it is better to\n>> use the term \"git commands\" consistently.\n>>\n>> Signed-off-by: Ori Avtalion<ori@avtalion.name>\n>> Signed-off-by: Nanako Shiraishi<nanako3@lavabit.com>\n>> ---\n>>\n>\n> Thanks Nanako!\n\nYou're welcome, and sorry if I sounded as if I was accusing that you were \nwasting other's time by not re-submitting sooner. I only wanted to see a \ngood patch go in.\n\n> You might want to consider this patch too:\n>\n> diff --git a/Documentation/git-mailsplit.txt\n> b/Documentation/git-mailsplit.txt\n> index 5cc94ec..8f1b99b 100644\n> --- a/Documentation/git-mailsplit.txt\n> +++ b/Documentation/git-mailsplit.txt\n> @@ -3,7 +3,7 @@ git-mailsplit(1)\n>\n>  NAME\n>  ----\n> -git-mailsplit - Simple UNIX mbox splitter program\n> +git-mailsplit - Simple UNIX mbox splitter\n>\n>  SYNOPSIS\n>  --------\n\nSorry, but I don't understand why it is necessary.\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"},{"id":"120329","messageId":"4A81FECE.5040806@avtalion.name","threadId":"20452","inReplyTo":"20090812075946.6117@nanako3.lavabit.com","subject":"Re: [PATCH] Change mentions of \"git programs\" to \"git commands\"","fromName":"Ori Avtalion","fromEmail":"ori@avtalion.name","sentAt":"2009-08-11T23:29:18Z","receivedAt":"2009-08-11T23:29:18Z","isPatch":true,"sender":{"key":"ori@avtalion.name","avatar":"https://avatars.githubusercontent.com/u/28355?v=4"},"body":"On 08/12/2009 01:59 AM, Nanako Shiraishi wrote:\n>> -git-mailsplit - Simple UNIX mbox splitter program\n>> +git-mailsplit - Simple UNIX mbox splitter\n>>\n>>   SYNOPSIS\n>>   --------\n>\n> Sorry, but I don't understand why it is necessary.\n>\n\nIt's another case where a command is called a \"program\" when, to the \nuser, it's simply a command such as \"git mailsplit\". Having the word \n\"command\" in a command description is redundant, so I just dropped the word.\n\nAnd here's another command with a similar description that I missed before:\n\"git-merge-one-file - The standard helper *program* to use with \ngit-merge-index\"\n"},{"id":"120461","messageId":"7veirgveq1.fsf@alter.siamese.dyndns.org","threadId":"20452","inReplyTo":"20090811125813.6117@nanako3.lavabit.com","subject":"Re: [PATCH] Change mentions of \"git programs\" to \"git commands\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-08-12T22:39:50Z","receivedAt":"2009-08-12T22:39:50Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nanako Shiraishi <nanako3@lavabit.com> writes:\n\n>  I copy-edited Ori's patch for your convenience, and tried to clarify\n>  the criteria you used to decide which \"program\" should become \"command\"\n>  in the updated commit log message, in case you forgot to apply it\n>  yourself.\n>\n>  I just didn't want to see the time you and others spent on submitting\n>  and reviewing wasted due to lack of resubmission of a revised patch.\n\nVery thoughtful.  I appreciate your occasional \"playing a capable project\nsecretary\", and I wish I see more like you.\n\nIndeed I've been swamped, and I tend to leave the final wrapping up to the\noriginal submitter and then forget.\n\nThanks.\n"},{"id":"120514","messageId":"4A8400D4.9010600@avtalion.name","threadId":"20452","inReplyTo":"4A81FECE.5040806@avtalion.name","subject":"Re: [PATCH] Change mentions of \"git programs\" to \"git commands\"","fromName":"Ori Avtalion","fromEmail":"ori@avtalion.name","sentAt":"2009-08-13T12:02:28Z","receivedAt":"2009-08-13T12:02:28Z","isPatch":true,"sender":{"key":"ori@avtalion.name","avatar":"https://avatars.githubusercontent.com/u/28355?v=4"},"body":"On 08/12/2009 02:29 AM, Ori Avtalion wrote:\n>>> -git-mailsplit - Simple UNIX mbox splitter program\n>>> +git-mailsplit - Simple UNIX mbox splitter\n>>>\n>>> SYNOPSIS\n>>> --------\n>>\n>\n> It's another case where a command is called a \"program\" when, to the\n> user, it's simply a command such as \"git mailsplit\". Having the word\n> \"command\" in a command description is redundant, so I just dropped the\n> word.\n>\n> And here's another command with a similar description that I missed before:\n> \"git-merge-one-file - The standard helper *program* to use with\n> git-merge-index\"\n\nShould I create a new patch for these two? Or is the change not welcome?\n"}]}