Skip to content

Commit 0e8c6fe

Browse files
authored
Merge pull request #1327 from agdillon/typos
fix typos
2 parents 82f05d5 + 1c55169 commit 0e8c6fe

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

book/07-git-tools/sections/submodules.asc

+2-2
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ Submodule DbConnector c3f01dc..c87d55d:
376376
Git will by default try to update *all* of your submodules when you run `git submodule update --remote` so if you have a lot of them, you may want to pass the name of just the submodule you want to try to update.
377377

378378
===== Pulling Upstream Changes from the Project Remote
379-
Let's now step into the shoes of your collaborator, who has his own local clone of the the MainProject repository.
379+
Let's now step into the shoes of your collaborator, who has his own local clone of the MainProject repository.
380380
Simply executing `git pull` to get your newly committed changes is not enough:
381381

382382
[source,console]
@@ -952,7 +952,7 @@ Your branch is up-to-date with 'origin/master'.
952952
nothing to commit, working tree clean
953953
----
954954

955-
Using the the `--recurse-submodules` flag of `git checkout` can also be useful when you work on several branches in the superproject, each having your submodule pointing at different commits.
955+
Using the `--recurse-submodules` flag of `git checkout` can also be useful when you work on several branches in the superproject, each having your submodule pointing at different commits.
956956
Indeed, if you switch between branches that record the submodule at different commits, upon executing `git status` the submodule will appear as ``modified'', and indicate ``new commits''. That is because the submodule state is by default not carried over when switching branches.
957957

958958
This can be really confusing, so it's a good idea to always `git checkout --recurse-submodules` when your project has submodules.

0 commit comments

Comments
 (0)