Skip to content

Commit

Permalink
Merge pull request #1932 from hamid-nazari/ch07_submodules
Browse files Browse the repository at this point in the history
Simple clarification
  • Loading branch information
ben authored Feb 21, 2024
2 parents 3db53b4 + 3dbf0ef commit 5f50ef6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion book/07-git-tools/sections/submodules.asc
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ You have to do some extra steps if you want changes in a submodule to be tracked

In order to set up your submodule to be easier to go in and hack on, you need to do two things.
You need to go into each submodule and check out a branch to work on.
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.
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.
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.

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

0 comments on commit 5f50ef6

Please sign in to comment.