diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-10-08 10:09:15 -0400 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2020-10-13 11:12:49 +0000 |
| commit | 3ade5bbd92b506f215f86a7d41048b22b287c673 (patch) | |
| tree | 2719b23d8221faddfbcad0cf6cc6433dec298d5d /docs/markdown/Subprojects.md | |
| parent | 47046c3fb988c656a04521df932900dc47f0f6db (diff) | |
| download | meson-3ade5bbd92b506f215f86a7d41048b22b287c673.zip meson-3ade5bbd92b506f215f86a7d41048b22b287c673.tar.gz meson-3ade5bbd92b506f215f86a7d41048b22b287c673.tar.bz2 | |
msubprojects: Handle change of URL in wrap-git
Diffstat (limited to 'docs/markdown/Subprojects.md')
| -rw-r--r-- | docs/markdown/Subprojects.md | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/markdown/Subprojects.md b/docs/markdown/Subprojects.md index 379c775..4461373 100644 --- a/docs/markdown/Subprojects.md +++ b/docs/markdown/Subprojects.md @@ -300,7 +300,7 @@ To pull latest version of all your subprojects at once, just run the command: prevent from any loss of local changes. - If subproject is currently in detached mode, a checkout of the revision from wrap file is performed. *Since 0.56.0* a rebase is also performed in case the - revision already existed locally by was outdated. If `--reset` is specified, + revision already existed locally but was outdated. If `--reset` is specified, a hard reset is performed instead of rebase. - If subproject is currently at the same branch as specified by the wrap file, a rebase on `origin` commit is performed. *Since 0.56.0* If `--reset` is @@ -312,6 +312,9 @@ To pull latest version of all your subprojects at once, just run the command: file is performed and a rebase is also performed in case the revision already existed locally by was outdated. If `--reset` is specified, a hard reset is performed instead of rebase. +- *Since 0.56.0* if the `url` specified in wrap file is different to the URL set + on `origin` for a git repository it will not be updated, unless `--reset` is + specified in which case the URL of `origin` will be reset first. ### Start a topic branch across all git subprojects |