Skip to content

Commit

Permalink
Change mentions of "git programs" to "git commands"
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
salty-horse authored and gitster committed Aug 12, 2009
1 parent 22f1fb6 commit 57f6ec0
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Documentation/config.txt
Expand Up @@ -604,7 +604,7 @@ color.interactive.<slot>::
Use customized color for 'git-add --interactive'
output. `<slot>` may be `prompt`, `header`, `help` or `error`, for
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>.

color.pager::
Expand Down Expand Up @@ -1100,7 +1100,7 @@ instaweb.port::
linkgit:git-instaweb[1].

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).
Currently this is used only by the `\--patch` mode of
linkgit:git-add[1]. Note that this setting is silently
Expand Down
2 changes: 1 addition & 1 deletion Documentation/fetch-options.txt
@@ -1,7 +1,7 @@
-q::
--quiet::
Pass --quiet to git-fetch-pack and silence any other internally
used programs.
used git commands.

-v::
--verbose::
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-rev-list.txt
Expand Up @@ -83,7 +83,7 @@ between the two operands. The following two commands are equivalent:
$ 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
this reason, it has a lot of different options that enables it to be
used by commands as different as 'git-bisect' and
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git.txt
Expand Up @@ -315,7 +315,7 @@ Synching repositories

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.

include::cmds-synchelpers.txt[]
Expand Down
2 changes: 1 addition & 1 deletion Documentation/gitattributes.txt
Expand Up @@ -404,7 +404,7 @@ Performing a three-way merge

The attribute `merge` affects how three versions of a file is
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::

Expand Down
4 changes: 2 additions & 2 deletions Documentation/gitcore-tutorial.txt
Expand Up @@ -12,7 +12,7 @@ git *
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.

If you just need to use git as a revision control system you may prefer
Expand Down Expand Up @@ -1328,7 +1328,7 @@ into it later. Obviously, this repository creation needs to be
done only once.

[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'
on the remote machine. The communication between the two over
the network internally uses an SSH connection.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/user-manual.txt
Expand Up @@ -4131,7 +4131,7 @@ What does this mean?

`git rev-list` is the original version of the revision walker, which
_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-parse` is not as important any more; it was only used to filter out
Expand Down
2 changes: 1 addition & 1 deletion help.c
Expand Up @@ -334,7 +334,7 @@ const char *help_unknown_cmd(const char *cmd)
const char *assumed = main_cmds.names[0]->name;
main_cmds.names[0] = NULL;
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"
"Continuing under the assumption that you meant '%s'\n",
cmd, assumed);
Expand Down

0 comments on commit 57f6ec0

Please sign in to comment.