diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-02-05 16:13:32 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-02-05 16:13:32 -0800 |
commit | e34c7e2b51c02a761a034b877b852dc0dbccf101 (patch) | |
tree | 2c80451e27d6fda5c0745270fee17da9e7bc2d1e /Documentation/gitmodules.txt | |
parent | 6d81ce0543c2fb7177c08491ba31a69aa54b7930 (diff) | |
parent | afeef30c34116ddc4a091d497f5ac8f4cdde7c65 (diff) | |
download | git-e34c7e2b51c02a761a034b877b852dc0dbccf101.tar.gz |
Merge branch 'ta/doc-no-small-caps'
Update documentation to change "GIT" which was a poor-man's small
caps to "Git". The latter was the intended spelling.
Also change "git" spelled in all-lowercase to "Git" when it refers
to the system as the whole or the concept it embodies, as opposed to
the command the end users would type.
* ta/doc-no-small-caps:
Documentation: StGit is the right spelling, not StGIT
Documentation: describe the "repository" in repository-layout
Documentation: add a description for 'gitfile' to glossary
Documentation: do not use undefined terms git-dir and git-file
Documentation: the name of the system is 'Git', not 'git'
Documentation: avoid poor-man's small caps GIT
Diffstat (limited to 'Documentation/gitmodules.txt')
-rw-r--r-- | Documentation/gitmodules.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index 52d7ae4313..6a1ca4abad 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/gitmodules.txt @@ -13,7 +13,7 @@ $GIT_WORK_DIR/.gitmodules DESCRIPTION ----------- -The `.gitmodules` file, located in the top-level directory of a git +The `.gitmodules` file, located in the top-level directory of a Git working tree, is a text file with a syntax matching the requirements of linkgit:git-config[1]. @@ -24,7 +24,7 @@ option of 'git submodule add'. Each submodule section also contains the following required keys: submodule.<name>.path:: - Defines the path, relative to the top-level directory of the git + Defines the path, relative to the top-level directory of the Git working tree, where the submodule is expected to be checked out. The path name must not end with a `/`. All submodule paths must be unique within the .gitmodules file. |