summaryrefslogtreecommitdiff
path: root/git-debrebase.1.pod
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2018-07-12 08:33:17 +0100
committerSean Whitton <spwhitton@spwhitton.name>2018-07-12 08:33:17 +0100
commitae8f33be945323e02e670a97c8ac6d42a0e1be40 (patch)
tree2bbf98c464b32b8ede618bf93929741246b81b5f /git-debrebase.1.pod
parent4a142fe137c1bed5a0cb5d14c41adcb3355458c4 (diff)
parent7166dbc963a9c01ce62a0564bb7b905156adb560 (diff)
Merge tag 'debian/5.8' into stretch-bpo
dgit release 5.8 for unstable (sid) [dgit] [dgit distro=debian] # gpg: Signature made Sun 08 Jul 2018 11:43:29 BST # gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39 # gpg: Can't check signature: No public key
Diffstat (limited to 'git-debrebase.1.pod')
-rw-r--r--git-debrebase.1.pod6
1 files changed, 6 insertions, 0 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 1c3e681..4d1a673 100644
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -135,6 +135,12 @@ If you git-rebase --abort,
the whole new upstream operation is aborted,
except for the laundering.
+<new-version>
+may be whole new Debian version, including revision,
+or just the upstream part,
+in which case -1 will be appended
+to make the new Debian version.
+
The <upstream-details> are, optionally, in order:
=over