Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simple clarification #1932

Merged
merged 2 commits into from
Feb 21, 2024
Merged

Simple clarification #1932

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97c1779
Simple clarification
hamid-nazari Feb 20, 2024
3dbf0ef
Update book/07-git-tools/sections/submodules.asc
ben Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion book/07-git-tools/sections/submodules.asc
View file
Open in desktop
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