Skip to content

Commit 88595eb

Browse files
committed
Merge branch 'ms/non-ascii-ticks' into maint
Doc markup fix. * ms/non-ascii-ticks: Documentation/gitsubmodules.txt: avoid non-ASCII apostrophes
2 parents 393eee1 + 1316416 commit 88595eb

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Documentation/gitsubmodules.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ On the filesystem, a submodule usually (but not always - see FORMS below)
2424
consists of (i) a Git directory located under the `$GIT_DIR/modules/`
2525
directory of its superproject, (ii) a working directory inside the
2626
superproject's working directory, and a `.git` file at the root of
27-
the submodules working directory pointing to (i).
27+
the submodule's working directory pointing to (i).
2828

2929
Assuming the submodule has a Git directory at `$GIT_DIR/modules/foo/`
3030
and a working directory at `path/to/bar/`, the superproject tracks the
@@ -33,7 +33,7 @@ in its `.gitmodules` file (see linkgit:gitmodules[5]) of the form
3333
`submodule.foo.path = path/to/bar`.
3434

3535
The `gitlink` entry contains the object name of the commit that the
36-
superproject expects the submodules working directory to be at.
36+
superproject expects the submodule's working directory to be at.
3737

3838
The section `submodule.foo.*` in the `.gitmodules` file gives additional
3939
hints to Git's porcelain layer. For example, the `submodule.foo.url`
@@ -136,27 +136,27 @@ using older versions of Git.
136136
+
137137
It is possible to construct these old form repositories manually.
138138
+
139-
When deinitialized or deleted (see below), the submodules Git
139+
When deinitialized or deleted (see below), the submodule's Git
140140
directory is automatically moved to `$GIT_DIR/modules/<name>/`
141141
of the superproject.
142142

143143
* Deinitialized submodule: A `gitlink`, and a `.gitmodules` entry,
144-
but no submodule working directory. The submodules Git directory
144+
but no submodule working directory. The submodule's Git directory
145145
may be there as after deinitializing the Git directory is kept around.
146146
The directory which is supposed to be the working directory is empty instead.
147147
+
148148
A submodule can be deinitialized by running `git submodule deinit`.
149149
Besides emptying the working directory, this command only modifies
150-
the superprojects `$GIT_DIR/config` file, so the superprojects history
150+
the superproject's `$GIT_DIR/config` file, so the superproject's history
151151
is not affected. This can be undone using `git submodule init`.
152152

153153
* Deleted submodule: A submodule can be deleted by running
154154
`git rm <submodule path> && git commit`. This can be undone
155155
using `git revert`.
156156
+
157-
The deletion removes the superprojects tracking data, which are
157+
The deletion removes the superproject's tracking data, which are
158158
both the `gitlink` entry and the section in the `.gitmodules` file.
159-
The submodules working directory is removed from the file
159+
The submodule's working directory is removed from the file
160160
system, but the Git directory is kept around as it to make it
161161
possible to checkout past commits without requiring fetching
162162
from another repository.

0 commit comments

Comments
 (0)