Change mentions of "git programs" to "git commands"

Most of the docs and printouts refer to "commands" when discussing what
the end users call via the "git" top-level program. We should refer them
as "git programs" when we discuss the fact that the commands are
implemented as separate programs, but in other contexts, it is better to
use the term "git commands" consistently.

Signed-off-by: Ori Avtalion <ori@avtalion.name>
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ori Avtalion 2009-08-07 17:24:21 +03:00 коммит произвёл Junio C Hamano
Родитель 22f1fb66be
Коммит 57f6ec0290
8 изменённых файлов: 10 добавлений и 10 удалений

Просмотреть файл

@ -604,7 +604,7 @@ color.interactive.<slot>::
Use customized color for 'git-add --interactive' Use customized color for 'git-add --interactive'
output. `<slot>` may be `prompt`, `header`, `help` or `error`, for output. `<slot>` may be `prompt`, `header`, `help` or `error`, for
four distinct types of normal output from interactive four distinct types of normal output from interactive
programs. The values of these variables may be specified as commands. The values of these variables may be specified as
in color.branch.<slot>. in color.branch.<slot>.
color.pager:: color.pager::
@ -1100,7 +1100,7 @@ instaweb.port::
linkgit:git-instaweb[1]. linkgit:git-instaweb[1].
interactive.singlekey:: interactive.singlekey::
In interactive programs, allow the user to provide one-letter In interactive commands, allow the user to provide one-letter
input with a single key (i.e., without hitting enter). input with a single key (i.e., without hitting enter).
Currently this is used only by the `\--patch` mode of Currently this is used only by the `\--patch` mode of
linkgit:git-add[1]. Note that this setting is silently linkgit:git-add[1]. Note that this setting is silently

Просмотреть файл

@ -1,7 +1,7 @@
-q:: -q::
--quiet:: --quiet::
Pass --quiet to git-fetch-pack and silence any other internally Pass --quiet to git-fetch-pack and silence any other internally
used programs. used git commands.
-v:: -v::
--verbose:: --verbose::

Просмотреть файл

@ -83,7 +83,7 @@ between the two operands. The following two commands are equivalent:
$ git rev-list A...B $ git rev-list A...B
----------------------------------------------------------------------- -----------------------------------------------------------------------
'git-rev-list' is a very essential git program, since it 'rev-list' is a very essential git command, since it
provides the ability to build and traverse commit ancestry graphs. For provides the ability to build and traverse commit ancestry graphs. For
this reason, it has a lot of different options that enables it to be this reason, it has a lot of different options that enables it to be
used by commands as different as 'git-bisect' and used by commands as different as 'git-bisect' and

Просмотреть файл

@ -315,7 +315,7 @@ Synching repositories
include::cmds-synchingrepositories.txt[] include::cmds-synchingrepositories.txt[]
The following are helper programs used by the above; end users The following are helper commands used by the above; end users
typically do not use them directly. typically do not use them directly.
include::cmds-synchelpers.txt[] include::cmds-synchelpers.txt[]

Просмотреть файл

@ -404,7 +404,7 @@ Performing a three-way merge
The attribute `merge` affects how three versions of a file is The attribute `merge` affects how three versions of a file is
merged when a file-level merge is necessary during `git merge`, merged when a file-level merge is necessary during `git merge`,
and other programs such as `git revert` and `git cherry-pick`. and other commands such as `git revert` and `git cherry-pick`.
Set:: Set::

Просмотреть файл

@ -12,7 +12,7 @@ git *
DESCRIPTION DESCRIPTION
----------- -----------
This tutorial explains how to use the "core" git programs to set up and This tutorial explains how to use the "core" git commands to set up and
work with a git repository. work with a git repository.
If you just need to use git as a revision control system you may prefer If you just need to use git as a revision control system you may prefer
@ -1328,7 +1328,7 @@ into it later. Obviously, this repository creation needs to be
done only once. done only once.
[NOTE] [NOTE]
'git-push' uses a pair of programs, 'git-push' uses a pair of commands,
'git-send-pack' on your local machine, and 'git-receive-pack' 'git-send-pack' on your local machine, and 'git-receive-pack'
on the remote machine. The communication between the two over on the remote machine. The communication between the two over
the network internally uses an SSH connection. the network internally uses an SSH connection.

Просмотреть файл

@ -4131,7 +4131,7 @@ What does this mean?
`git rev-list` is the original version of the revision walker, which `git rev-list` is the original version of the revision walker, which
_always_ printed a list of revisions to stdout. It is still functional, _always_ printed a list of revisions to stdout. It is still functional,
and needs to, since most new Git programs start out as scripts using and needs to, since most new Git commands start out as scripts using
`git rev-list`. `git rev-list`.
`git rev-parse` is not as important any more; it was only used to filter out `git rev-parse` is not as important any more; it was only used to filter out

2
help.c
Просмотреть файл

@ -334,7 +334,7 @@ const char *help_unknown_cmd(const char *cmd)
const char *assumed = main_cmds.names[0]->name; const char *assumed = main_cmds.names[0]->name;
main_cmds.names[0] = NULL; main_cmds.names[0] = NULL;
clean_cmdnames(&main_cmds); clean_cmdnames(&main_cmds);
fprintf(stderr, "WARNING: You called a Git program named '%s', " fprintf(stderr, "WARNING: You called a Git command named '%s', "
"which does not exist.\n" "which does not exist.\n"
"Continuing under the assumption that you meant '%s'\n", "Continuing under the assumption that you meant '%s'\n",
cmd, assumed); cmd, assumed);