Skip to content

Commit 5f50ef6

Browse files
authored
Merge pull request #1932 from hamid-nazari/ch07_submodules
Simple clarification
2 parents 3db53b4 + 3dbf0ef commit 5f50ef6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ You have to do some extra steps if you want changes in a submodule to be tracked
466466

467467
In order to set up your submodule to be easier to go in and hack on, you need to do two things.
468468
You need to go into each submodule and check out a branch to work on.
469-
Then you need to tell Git what to do if you have made changes and then `git submodule update --remote` pulls in new work from upstream.
469+
Then you need to tell Git what to do if you have made changes and later `git submodule update --remote` pulls in new work from upstream.
470470
The options are that you can merge them into your local work, or you can try to rebase your local work on top of the new changes.
471471

472472
First of all, let's go into our submodule directory and check out a branch.

0 commit comments

Comments
 (0)