diff options
| author | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2022-08-16 15:35:10 -0400 |
|---|---|---|
| committer | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2022-08-16 17:00:14 -0400 |
| commit | 83b185a8c9736e504c28949e9e5e2cdf5d8314ce (patch) | |
| tree | 5c05330c983a3459f3221469d89e21a7bf148891 /b4/command.py | |
| parent | 44431bc042de69ddc51a3d6e4e37acb249cf29cf (diff) | |
| download | b4-83b185a8c9736e504c28949e9e5e2cdf5d8314ce.tar.gz | |
ez: support enrolling branches using tags
Allow using tags when enrolling branches instead of only allowing branch
names. In fact, with the default "commit" strategy we can even enroll
using something like HEAD~3, but that's not recommended for newbies --
just pass the branch name.
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Diffstat (limited to 'b4/command.py')
| -rw-r--r-- | b4/command.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/b4/command.py b/b4/command.py index 62d9cb1..a434d30 100644 --- a/b4/command.py +++ b/b4/command.py @@ -266,8 +266,8 @@ def cmd(): ag_prepn.add_argument('-f', '--fork-point', dest='fork_point', help='When creating a new branch, use this fork point instead of HEAD') ag_prepe = sp_prep.add_argument_group('Enroll existing branch', 'Enroll existing branch for prep work') - ag_prepe.add_argument('-e', '--enroll-with-base', dest='base_branch', - help='Enroll current branch, using the branch passed as parameter as base branch') + ag_prepe.add_argument('-e', '--enroll', dest='enroll_base', + help='Enroll current branch, using the passed tag, branch, or commit as fork base') sp_prep.set_defaults(func=cmd_prep) # b4 trailers |