mantisbt:git_submodules
Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revisionLast revisionBoth sides next revision | ||
mantisbt:git_submodules [2014/04/30 11:53] – Added section: Updating a Library's submodule dregad | mantisbt:git_submodules [2014/04/30 12:27] – Update master branch from upstream, push tags and note dregad | ||
---|---|---|---|
Line 120: | Line 120: | ||
Submodule path ' | Submodule path ' | ||
</ | </ | ||
+ | |||
+ | |||
+ | |||
+ | |||
Line 127: | Line 131: | ||
The examples given here are for the ADOdb library, but the same logic should apply (possibly with some variations) to other submodules as well. | The examples given here are for the ADOdb library, but the same logic should apply (possibly with some variations) to other submodules as well. | ||
- | We assume that you have a local repository configured with the appropriate remotes (*upstream* for the library' | + | We assume that you already |
- | - Update the library' | + | - Update the library' |
* Get the latest from upstream < | * Get the latest from upstream < | ||
cd / | cd / | ||
git fetch upstream | git fetch upstream | ||
+ | </ | ||
+ | * Optional: update the //master// branch < | ||
+ | git rebase upstream/ | ||
</ | </ | ||
* Update the branch < | * Update the branch < | ||
Line 140: | Line 147: | ||
* Resolve any conflicts | * Resolve any conflicts | ||
* Push changes to the fork < | * Push changes to the fork < | ||
- | git push origin | + | git push origin |
- | </ | + | </ |
- Update the submodule | - Update the submodule | ||
* Go to your local mantisbt repository and update it< | * Go to your local mantisbt repository and update it< | ||
Line 157: | Line 164: | ||
- Commit the changes < | - Commit the changes < | ||
git commit -a | git commit -a | ||
+ | </ | ||
+ | |||
+ | At this point, checking the submodules' | ||
+ | |||
+ | < | ||
+ | $ git submodule | ||
+ | | ||
+ | | ||
+ | | ||
+ | | ||
</ | </ | ||
mantisbt/git_submodules.txt · Last modified: 2014/04/30 13:00 by dregad