diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-17 23:22:23 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-17 23:22:24 +0100 |
commit | 375a065009f11f786116a81d8d3a1edde32fe96b (patch) | |
tree | 5fcf59ee8b8721a4b9c05622757152cadaed3d6c /git-debrebase.1.pod | |
parent | e57c54ab8b45cefb6087295a7a5eb61a678e1188 (diff) |
git-debrebase: Rename new-upstream-v0 command to new-upstream
This UI is pretty good now, I think, for single-piece upstreams.
For multi-piece ones, which are quite tricky anyway, it is tolerable,
and we it doesn't steal much of the available syntax space. So we
don't need the -v0 any more.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase.1.pod')
-rw-r--r-- | git-debrebase.1.pod | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 6a98ed2..6168e14 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -100,7 +100,7 @@ If there is no ffq-prev, it is an error, unless --noop-ok. You should consider using B<conclude> instead, because that launders the branch too. -=item git-debrebase new-upstream-v0 <new-version> [<upstream-details>...] +=item git-debrebase new-upstream <new-version> [<upstream-details>...] Rebases the delta queue onto a new upstream version. In detail: @@ -199,11 +199,6 @@ L<git-deborig(1)>, L<git-archive(1)>, L<dgit(1)> and L<gbp-import-orig(1)> may be able to help. -This subcommand has -v0 in its name because we are not yet sure -that its command line syntax is optimal. -We may want to introduce an incompatible replacement syntax -under the name C<new-upstream>. - =item git-debrebase make-patches [--quiet-would-amend] Generate patches in debian/patches/ |