diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/qt/branch_qt.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/qt/branch_qt.py b/scripts/qt/branch_qt.py index 3cda4cf2..42b30798 100755 --- a/scripts/qt/branch_qt.py +++ b/scripts/qt/branch_qt.py @@ -375,7 +375,6 @@ def parse_args() -> argparse.Namespace: 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. |