From 5da562690e0c9946e07316ff08246c6afcb5417d Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Wed, 6 Nov 2019 12:09:21 +0200 Subject: branch_qt: Update help to note that sync is now implemented Amends 62a653d32176956365f1fe8b5cb148a6391a6c9d. Change-Id: I2e3c49cd9d753f1b47b8f634264f398fe6990522 Reviewed-by: Frederik Gladhorn --- scripts/qt/branch_qt.py | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') 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. -- cgit v1.2.3