diff options
| author | Ori Avtalion <ori@avtalion.name> | 2009-08-07 17:24:21 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-12 16:14:41 -0700 |
| commit | 57f6ec029090f64377ec5c0926b6e2e39b0caa4f (patch) | |
| tree | 75e2db8a3d86ab3a5563dac423d044813a4341ef /Documentation/gitattributes.txt | |
| parent | 22f1fb66be859fb5ab1620a7dce8e54702d4a07c (diff) | |
| download | git-57f6ec029090f64377ec5c0926b6e2e39b0caa4f.tar.gz | |
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>
Diffstat (limited to 'Documentation/gitattributes.txt')
| -rw-r--r-- | Documentation/gitattributes.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index aaa073efc8..1195e83b6e 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -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:: |