diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2020-05-27 13:57:47 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-05-27 17:36:16 -0700 |
| commit | f72c5db7d8b587facc24999af1d2fd03f2026d1a (patch) | |
| tree | b4f28a02a62983332412130c7e7bd424908412c4 /dgit-maint-debrebase.7.pod | |
| parent | d12484c1ff2e57d1bf6f0ad5f9604fa4059ffa6d (diff) | |
dgit-maint-debrebase(7): Drop bad advice about upstream/ tag case
The first argument to the new-upstream subcommand is a version number,
not a tag name, so this instruction could never have been correct.
The user should not need usually to pass both the upstream version
number and the upstream/ tag name, either, because git-debrebase
should find it for them.
Reported-by: David Bremner <bremner@debian.org>
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit-maint-debrebase.7.pod')
| -rw-r--r-- | dgit-maint-debrebase.7.pod | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index 373fb2f..fdbf2e8 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -394,8 +394,6 @@ or if you have a working watch file =back -replacing I<1.2.3> with I<upstream/1.2.3> if you imported a tarball. - This invocation of git-debrebase(1) involves a git rebase. You may need to resolve conflicts if the Debian delta queue does not apply cleanly to the new upstream source. |