From 97c1779e675c9d6f4f2df7a08d17262529d623fa Mon Sep 17 00:00:00 2001 From: Hamid Nazari Date: Tue, 20 Feb 2024 19:04:05 +0330 Subject: [PATCH 1/2] Simple clarification I think 'and then' is better changed for 'and when' or 'and when later' to better clarify this sentence --- book/07-git-tools/sections/submodules.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/07-git-tools/sections/submodules.asc b/book/07-git-tools/sections/submodules.asc index 47096120a..8a8191b7c 100644 --- a/book/07-git-tools/sections/submodules.asc +++ b/book/07-git-tools/sections/submodules.asc @@ -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 when 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. From 3dbf0ef589d457c31dc1d4c918ded2cf4774f7e9 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Tue, 20 Feb 2024 15:53:34 -0800 Subject: [PATCH 2/2] Update book/07-git-tools/sections/submodules.asc --- book/07-git-tools/sections/submodules.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/07-git-tools/sections/submodules.asc b/book/07-git-tools/sections/submodules.asc index 8a8191b7c..0d667462b 100644 --- a/book/07-git-tools/sections/submodules.asc +++ b/book/07-git-tools/sections/submodules.asc @@ -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 when later `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.