You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: README.md
+5-6Lines changed: 5 additions & 6 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -36,9 +36,8 @@ Being positioned at the branch you want to update, you can directly run the `./b
36
36
37
37
* Updates the active local branch (`git pull`) and submodules status (`git submodule init` & `git submodule update`).
38
38
* Updates all environment branches of each submodule.
39
-
* If the active branch is the first environment branch (the branch defined in the first position), the script directly does the following actions:
40
-
* Positions each submodule in the last commit (HEAD) of its first environment branch.
41
-
* Commits the produced changes by the previous action, in the event that there are, including as commit message the list of updates done by the script.
42
-
* If the active branch is any other different from the first, there are the following execution alternatives:
43
-
* If the script has been executed with the `[-k|--keep]` optional parameter,it directly perfoms the following actions:
44
-
* Merges the previous environment branch in order to propagate the commited and pushed changes made in the previous environment/s of the project.
39
+
* If the active branch is the first environment branch (the branch defined in the first position), the script directly positions each submodule in the last commit (HEAD) of its first environment branch.
40
+
* If the active branch is any other different from the first, the script merges the previous environment branch in order to propagate the commited and pushed changes made in the previous environment/s of the project, and then perfoms the following execution alternatives:
41
+
* If the script has been executed with the `[-k|--keep]` optional parameter, it keeps for each submodule the current commit versioned in the active branch, discarding the new submodules versions (commits) that may have been updated due to the merge process.
42
+
* If the script has been executed without any parameter, it shows for each submodule the current commit versioned in the active branch, and interactively asks to select the environment branch in which you want to position the submodule, offering an additional option to keep the current commit.
43
+
* Commits the changes made by the previous action, in the event that there are, including as commit message the list of updates made by the script.
0 commit comments