diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2019-09-16 15:31:50 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-09-16 15:31:50 -0700 |
| commit | b773eefd1773bc2195f87f03721c89f7efb498f3 (patch) | |
| tree | b5e6e444b9f0786132a8f798bd6141878521cf7d /git-debrebase.5.pod | |
| parent | 1045e26443f21378d6fb98a46ace40c0d883cea6 (diff) | |
| parent | 896c94474922bc2698474c5ba57321fa61504238 (diff) | |
Merge tag 'debian/9.9' into buster-bpo
dgit release 9.9 for unstable (sid) [dgit]
[dgit distro=debian no-split]
# gpg: Signature made Sat 14 Sep 2019 01:35:57 PM MST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key
Diffstat (limited to 'git-debrebase.5.pod')
| -rw-r--r-- | git-debrebase.5.pod | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod index 8209fc1..d55033b 100644 --- a/git-debrebase.5.pod +++ b/git-debrebase.5.pod @@ -562,7 +562,7 @@ paying no attention to PROSE. The full set of annotations is: [git-debrebase split: mixed commit, debian part] [git-debrebase split: mixed commit, upstream-part] - [git-debrebase onvert dgit import: debian changes] + [git-debrebase convert dgit import: debian changes] [git-debrebase anchor: convert dgit import, upstream changes] [git-debrebase upstream-combine . PIECE[ PIECE...]: new upstream] |