Skip to content

Commit

Permalink
Merge pull request #1038 from notlmn/grammar
Browse files Browse the repository at this point in the history
add omitted word
  • Loading branch information
ben authored Apr 23, 2018
2 parents 4a3dec9 + ba73b89 commit 50ae760
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 @@ -384,7 +384,7 @@ This means that there is no local working branch (like ``master'', for example)
With no working branch tracking changes, that means even if you commit changes to the submodule, those changes will quite possibly be lost the next time you run `git submodule update`.
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 do two things.
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.
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.
Expand Down

0 comments on commit 50ae760

Please sign in to comment.