diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-07-29 14:43:22 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-07-29 20:42:20 +0200 |
| commit | cacf06752406afffbd358b75fb0f232f4fa613c5 (patch) | |
| tree | 98f32b6d81e01f1a343d4c2cec4ae278e3bec598 | |
| parent | 0a9ed4faa7416380c3210e66da52c359cd372be4 (diff) | |
Extend help text for branch_qt.py script
Change-Id: I92f7d9bb861440172ea03bed3282b513b56c5d00
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| -rwxr-xr-x | scripts/qt/branch_qt.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/qt/branch_qt.py b/scripts/qt/branch_qt.py index 81b108e3..910f27aa 100755 --- a/scripts/qt/branch_qt.py +++ b/scripts/qt/branch_qt.py @@ -345,9 +345,16 @@ def parse_args() -> argparse.Namespace: choices=["branch", "sync", "merge", "bump"], required=True, help=dedent("""\ - branch - start soft branching + branch - start soft branching: create the "to" branch based on the "from" branch + branch_qt.py -m branch --from 5.12 --to 5.12.4 + Now 5.12.4 will exist, based on 5.12. sync - intermediate sync, to update a branch during soft-branching + branch_qt.py -m sync --from 5.12 --to 5.12.4 + Move the new branch fast-forward, assuming only 5.12 has new commits. + Not yet implemented. merge - down-merge + branch_qt.py -m merge --from 5.12 --to 5.12.4 + Merges 5.12 into 5.12.4. bump - version bump, to move from 5.12.3 to 5.12.4: branch_qt.py -m bump --from 5.12 --to 5.12.4""")) parser.add_argument("--from", "-f", required=True, |